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 ef4281d86e9add780d9be0fd84a13ceb557263fa..c8f9c836ba57c4c0135e072e4e0b1b9ef6fd68c9 100644 (file)
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -8,20 +7,26 @@
           xmlns:f="http://xmlns.jcp.org/jsf/core"
           >
  
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_HOME}</ui:define>
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <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()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
                                 Here goes your content.
                         </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="#{userLoginController.ifUserMustChangePassword()}">
+                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                         </ui:fragment>
                 </ui:define>
         </ui:composition>