X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fuser%2Flogin_edit_user_data.xhtml;h=67fbf8a638622574c749ac6ada42977583dabd32;hb=09c17cd0daabd9b7278aacd72aea5e31d2ae82a7;hp=261571cb7b2a128fa0a7999f435b017aff947190;hpb=c4af0b020794b21aad505d1cc700e2f081a10009;p=jjobs-war.git

diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 261571cb..67fbf8a6 100644
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -1,50 +1,55 @@
 <?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"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				<div class="table">
-					<div class="table_header">
-						#{msg.LOGIN_EDIT_USER_DATA_TITLE}
-					</div>
-
-					<div class="para notice">
-						<h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
-					</div>
-
-					<div class="para">
-						<ul>
+<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:define name="login_title">
+		<h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+			<div class="table">
+				<div class="table_header">
+					<h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
+				</div>
+
+				<div class="para notice">
+					<h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
+				</div>
+
+				<div class="para">
+					<ul>
+						<ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
 							<li>
-								<h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
+								<h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
 							</li>
+						</ui:fragment>
+
+						<ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
 							<li>
-								<h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+								<h:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
 							</li>
+						</ui:fragment>
+
+						<ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
 							<li>
-								<h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+								<h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
 							</li>
-						</ul>
-					</div>
+						</ui:fragment>
+					</ul>
 				</div>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+			</div>
+		</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>
