Please cherry-pick:

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

diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index 170e5fcb20c09c6c9adc30df56a8818139c07dad..0c6f662b0e70099680f05aef653d6114b1b6e281 100644 (file)
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -1,31 +1,42 @@
 <?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:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-                       <ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-                               <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-                       </ui:include>
-               </ui:fragment>
+               <core:outputMessageBox
+                       panelGroupId="loginUserDataSaved"
+                       message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+                       rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+                       />
+
+               <core:outputMessageBox
+                       panelGroupId="errorUserEditDataDisabled"
+                       message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('edit_user_data')}"
+                       />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       <p:link
+                               outcome="user_change_password"
+                               value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                               />
                </ui:fragment>
 
-               <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
-
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                </ui:fragment>