X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fuser%2Flogin_change_email_address.xhtml;h=aef0c762cba1441d54bfc9c29609fb4eef06766c;hb=3a49382bdd28776b0f2c8a98493894815545990b;hp=702312d826943741b59b002f82352d34f232b737;hpb=4538f38e35e68f5752a45b6db773108e53d6078f;p=addressbook-war.git

diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 702312d8..aef0c762 100644
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -3,10 +3,10 @@
 <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/login_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}</ui:define>
@@ -19,49 +19,29 @@
 			<ui:fragment rendered="#{loginController.isUserLoggedIn()}">
 				<div class="table">
 					<div class="table_header">
-						#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}
+						<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
 					</div>
 
-					<h:form id="login_form">
+					<h:form id="login_change_email_address_form">
 						<div class="para">
 							<fieldset id="change_email">
-								<legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_EMAIL_LEGEND}</legend>
+								<legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
+									<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
+								</legend>
 
 								<div class="table_row">
 									<div class="table_left">
-										#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}
+										<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
 									</div>
 
 									<div class="table_right">
-										#{userController.emailAddress}
+										<h:outputText value="#{contactController.emailAddress}" />
 									</div>
 
 									<div class="clear"></div>
 								</div>
 
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="emailAddress1" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL1}" />
-									</div>
-
-									<div class="table_right">
-										<h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{emailChangeController.emailAddress1}" required="true" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="emailAddress2" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL2}" />
-									</div>
-
-									<div class="table_right">
-										<h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{emailChangeController.emailAddress2}" required="true" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
+								<ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
 							</fieldset>
 						</div>
 
