Please cherry-pick:

[pizzaservice-war.git] / web / WEB-INF / templates / login / user / user_menu.tpl

diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
index d6e8c5e08f623a1c94bb01dad6f931feb080a8ab..7ec730a1fad8efbb94c5997f6bfe2ede54fede8b 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_menu.tpl
+++ b/web/WEB-INF/templates/login/user/user_menu.tpl
@@ -27,18 +27,42 @@
                                </ui:fragment>
                        </ul>
 
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data') or featureController.isFeatureEnabled('change_user_password') or featureController.isFeatureEnabled('user_change_email_address')}">
                                <div class="menu_header">
-                                       <h:outputText value="#{msg.MENU_EDIT_PROFILE_TITLE}" />
+                                       <h:outputText value="#{msg.MENU_USER_EDIT_PROFILE_TITLE}" />
                                </div>
 
                                <ul>
-                                       <li>
-                                               <h:link title="#{msg.LINK_LOGIN_EDIT_USER_DATA_TITLE}" outcome="user_edit_user_data" value="#{msg.LINK_LOGIN_EDIT_USER_DATA}" />
-                                       </li>
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data')}">
+                                               <li>
+                                                       <h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
+                                               </li>
+                                       </ui:fragment>
+
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_change_email_address')}">
+                                               <li>
+                                                       <h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+                                               </li>
+                                       </ui:fragment>
+
+                                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword() or featureController.isFeatureEnabled('change_user_password')}">
+                                               <li>
+                                                       <h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="user_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+                                               </li>
+                                       </ui:fragment>
                                </ul>
                        </ui:fragment>
 
+                       <div class="menu_header">
+                               <h:outputText value="#{msg.MENU_APPLICATIONS_TITLE}" />
+                       </div>
+
+                       <ul>
+                               <li>
+                                       <h:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="user_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
+                               </li>
+                       </ul>
+
                        <div class="menu_header">
                                <h:outputText value="#{msg.MENU_LOGOUT_TITLE}" />
                        </div>