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

diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 756c2f44..aef0c762 100644
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -3,12 +3,12 @@
 <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/user/user_base.tpl">
+	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}</ui:define>
 
 		<ui:define name="content_header">
@@ -19,64 +19,44 @@
 			<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">
-										#{contactController.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 styleClass="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 styleClass="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>
 
-						<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
 						<div class="table_footer">
-							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton styleClass="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
+							<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.doChangeEmailAddress()}" />
 						</div>
 					</h:form>
 				</div>
 			</ui:fragment>
 
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.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>
