Please cherry-pick:

[pizzaservice-war.git] / web / user / login_edit_user_data.xhtml

diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 67fbf8a638622574c749ac6ada42977583dabd32..44336717883bb0180318d46a73e97a50a61fb774 100644 (file)
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -14,39 +14,35 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                       <div class="table">
-                               <div class="table_header">
-                                       <h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
-                               </div>
-
-                               <div class="para notice">
-                                       <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
-                               </div>
-
-                               <div class="para">
-                                       <ul>
-                                               <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                                                       <li>
-                                                               <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
-                                                       </li>
-                                               </ui:fragment>
-
-                                               <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                                                       <li>
-                                                               <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
-                                                       </li>
-                                               </ui:fragment>
-
-                                               <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
-                                                       <li>
-                                                               <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
-                                                       </li>
-                                               </ui:fragment>
-                                       </ul>
-                               </div>
+               <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                       <div class="table-header">
+                               <h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
                        </div>
-               </ui:fragment>
+
+                       <h:panelGroup styleClass="para notice" layout="block">
+                               <h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
+                       </h:panelGroup>
+
+                       <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
+                               <ul>
+                                       <ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
+                                               <li>
+                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
+                                               </li>
+                                       </ui:fragment>
+
+                                       <ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
+                                               <li>
+                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+                                               </li>
+                                       </ui:fragment>
+
+                                       <li>
+                                               <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
+                                       </li>
+                               </ul>
+                       </h:panelGroup>
+               </h:panelGroup>
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />