Please cherry-pick:

[jjobs-war.git] / web / user / login_user_change_password.xhtml

diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index 7eddb313727d689ba794486d917d845cc3756e0b..35f7cdaf8e7734576aa61a24a3ce003ed97ac0c5 100644 (file)
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -14,11 +15,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" />
-                       </ui:include>
-               </ui:fragment>
+               <widgets:outputMessageBox message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
 
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                        <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
@@ -78,12 +75,7 @@
                        </h:panelGroup>
                </ui:fragment>
 
-               <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
+               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />