X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fuser%2Flogin_user_change_email_address.xhtml;h=8d32c4d6636860e16ea9d26b75dbd1f2f7eb5926;hb=88344c201dccb8ccc2dec09190ab3efd596ef210;hp=2127d8a01b85160b698371044a414b9be590e97d;hpb=3040b6cdad5db3416ae59543d4f8658403d2bdaf;p=jjobs-war.git

diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index 2127d8a0..8d32c4d6 100644
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -1,40 +1,42 @@
 <?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:core="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">
+				xmlns:f="http://xmlns.jcp.org/jsf/core"
+				xmlns:p="http://primefaces.org/ui">
 
-	<ui:define name="login_title">
+	<ui:define name="document_login_title">
 		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
 	</ui:define>
 
 	<ui:define name="content">
+		<core:outputMessageBox id="error-user-change-email-disabled" message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" messageStyleClass="alert-danger" 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">
+			<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">
+				<fieldset class="fieldset">
 					<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:panelGroup styleClass="table-row" layout="block">
+						<div class="table-left">
 							<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
 						</div>
 
-						<div class="table_right">
+						<div class="table-right">
 							<h:outputText value="#{contactController.emailAddress}" />
 						</div>
-
-						<div class="clear"></div>
 					</h:panelGroup>
 
 					<ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
@@ -44,22 +46,15 @@
 
 				<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-				<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 class="table-footer">
+					<p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="submit_change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
 				</div>
 			</h:form>
 		</h:panelGroup>
 
-		<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-				<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" />
-				<ui:param name="styleClass" value="errors" />
-			</ui:include>
-		</ui:fragment>
-
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-			<ui:include id="login_only" src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
 		</ui:fragment>
 	</ui:define>
 </ui:composition>