X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fuser%2Flogin_contact_data_saved.xhtml;h=d2b1e88cfc3707dcfa5948e2fac52f4979c58c4b;hb=30dae4576f67b2f818eebecd35e3a9811ccd4559;hp=35378eba050b99aa64430ad652c5a43f16644fe5;hpb=b5cf54a6511a711b34e3de8974ad727872ade180;p=jjobs-war.git

diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index 35378eba..d2b1e88c 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -1,29 +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}"
 	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: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">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CONTACT_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: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/generic/message_box.tpl">
 					<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
 				</ui:include>
 			</ui:fragment>
 
+			<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+				<h: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 id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
