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

diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 3cfd020c..aef0c762 100644
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -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="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" 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="emailAddressRepeat" size="20" maxlength="255" value="#{emailChangeController.emailAddressRepeat}" 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>