Please cherry-pick:

[jjobs-war.git] / web / user / login_change_email_address.xhtml

diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 551dcc80addedfb5587ca6d8653d0ccd10c39ace..7db906ed913bfba9f01370898952eb5a9f05c52b 100644 (file)
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -17,12 +17,12 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
                                <div class="table_header">
                                        <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
                                </div>
 
-                               <h:form id="form_login_change_email_address">
+                               <h:form id="form_user_change_email_address">
                                        <div class="para">
                                                <fieldset class="fieldset" id="change_email">
                                                        <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
@@ -54,14 +54,15 @@
                                </h:form>
                        </h:panelGroup>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
-
-                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>