X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fuser%2Flogin_user_data_saved.xhtml;h=dd461a19f259cd9c93f9d6753027445f08267c86;hb=d0ed0869aedbd0d709507837e2e2545d4c51b760;hp=577d0d01d0c308d8c705aea3189c164038b9e91f;hpb=b5cf54a6511a711b34e3de8974ad727872ade180;p=jjobs-war.git

diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index 577d0d01..dd461a19 100644
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -1,30 +1,36 @@
 <?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}"
+<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"
-	  >
+	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:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}</ui:define>
+	<ui:define name="document_login_title">
+		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
+	</ui:define>
 
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}
-		</ui:define>
+	<ui:define name="login_content_header">
+		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}" />
+	</ui:define>
 
-		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				<ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-				</ui:include>
-			</ui:fragment>
+	<ui:define name="content">
+		<core:outputMessageBox
+			panelGroupId="loginUserDataSaved"
+			message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+			rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+			/>
 
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+		<p:link
+			outcome="user_change_password"
+			value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+			rendered="#{userLoginController.ifUserMustChangePassword()}"
+			/>
+
+		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+		</ui:fragment>
+	</ui:define>
+</ui:composition>
