Maybe 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 c9f812376808e5e658d2a5ad0f5de53d3902917c..c8f9c836ba57c4c0135e072e4e0b1b9ef6fd68c9 100644 (file)
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -8,14 +8,16 @@
          >
 
        <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="#{userLoginController.isUserLoggedIn() and not userLoginController.ifUserMustChangePassword()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
                                Here goes your content.
                        </ui:fragment>