Please cherry-pick:

[addressbook-war.git] / web / user / login_index.xhtml

diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index 81e3a287f2518c09a77c7e7b57a134e11cddd8a2..902550a7309f622d5f1b7873bc71f7d40456f48c 100644 (file)
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -9,15 +9,21 @@
          >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_HOME}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_HOME}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_HOME}" />
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               Here goes your content.
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                               <!-- @TODO Here goes your content. //-->
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">