X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fuser%2Flogin_edit_user_data.xhtml;h=44336717883bb0180318d46a73e97a50a61fb774;hb=99063ebd3ae6b5f6930e1234a89985a9e2e8e12c;hp=1270ebf058eac4d72db8cd92277615f3057382d4;hpb=b0265c5e340e64e644d8b336bc86b1876fb775aa;p=pizzaservice-war.git

diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 1270ebf0..44336717 100644
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -1,57 +1,51 @@
-<!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/user/user_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() and not userLoginController.ifUserMustChangePassword()}">
-				<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()}">
-								<li>
-									<h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
-								</li>
-							</ui:fragment>
-
-							<ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data') and not userLoginController.ifUserMustChangePassword()}">
-								<li>
-									<h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_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}" />
-								</li>
-							</ui:fragment>
-						</ul>
-					</div>
-				</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>
-</html>
+<?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: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">
+		<h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+			<div class="table-header">
+				<h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
+			</div>
+
+			<h:panelGroup styleClass="para notice" layout="block">
+				<h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
+				<ul>
+					<ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
+						<li>
+							<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="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
+						<li>
+							<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>
+
+					<li>
+						<h:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
+					</li>
+				</ul>
+			</h:panelGroup>
+		</h:panelGroup>
+
+		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+		</ui:fragment>
+	</ui:define>
+</ui:composition>
