X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fuser%2Flogin_user_change_email_address.xhtml;h=fedd9d48bd6c54ecdd7809a5ee53a100c24329fd;hb=77036fe3f07dd6a9f107c6d52cd24ffb45e97e0b;hp=1df0b8c34ba093a6f8609fdb43bb9caf73443090;hpb=6a66eb4f1fd445bc8610beaad2a02d89996f1844;p=pizzaservice-war.git

diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index 1df0b8c3..fedd9d48 100644
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -1,68 +1,59 @@
-<!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_USER_CHANGE_EMAIL_ADDRESS}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}
-		</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'))}">
-				<div class="table">
-					<div class="table_header">
-						<h:outputText value="#{msg.LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" />
-					</div>
-
-					<h:form id="form_login_user_change_email_address">
-						<div class="para">
-							<fieldset id="change_email">
-								<legend title="#{msg.LOGIN_USER_CHANGE_EMAIL_LEGEND_TITLE}">
-									<h:outputText value="#{msg.LOGIN_USER_CHANGE_EMAIL_LEGEND}" />
-								</legend>
-
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputText value="#{msg.LOGIN_USER_CHANGE_EMAIL_OLD_ADDRESS}" />
-									</div>
-
-									<div class="table_right">
-										<h:outputText value="#{contactController.emailAddress}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
-							</fieldset>
+<?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:widgets="http://mxchange.org/jsf/core/widgets"
+				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_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
+
+		<h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
+			<div class="table_header">
+				<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
+			</div>
+
+			<h:form id="form_user_change_email_address">
+				<fieldset class="fieldset" id="change_email">
+					<legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
+						<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
+					</legend>
+
+					<h:panelGroup styleClass="table_row" layout="block">
+						<div class="table_left">
+							<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
 						</div>
 
-						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
-
-						<div class="table_footer">
-							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doUserChangeEmailAddress()}" />
+						<div class="table_right">
+							<h:outputText value="#{contactController.emailAddress}" />
 						</div>
-					</h:form>
-				</div>
-			</ui:fragment>
+					</h:panelGroup>
+
+					<ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
+				</fieldset>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+				<div class="para"></div>
 
-			<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-				<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-			</ui:fragment>
+				<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+				<div class="table_footer">
+					<h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
+				</div>
+			</h:form>
+		</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>
