X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fuser%2Flogin_user_change_personal_data.xhtml;h=a33aa2c247d61dfc84066cab3ed34fa9fec08fc7;hb=88344c201dccb8ccc2dec09190ab3efd596ef210;hp=89e5b773ee1811c2b4ae003e0ddb3dcab7ece324;hpb=3040b6cdad5db3416ae59543d4f8658403d2bdaf;p=jjobs-war.git

diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
index 89e5b773..a33aa2c2 100644
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -1,21 +1,33 @@
 <?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_PERSONAL_DATA}" />
 	</ui:define>
 
-	<ui:define name="content_header">
+	<ui:define name="login_content_header">
 		<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
 	</ui:define>
 
 	<ui:define name="content">
-		<h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-			<div class="table_header">
+		<core:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+
+		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+			<p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+		</ui:fragment>
+
+		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+		</ui:fragment>
+
+		<h:panelGroup styleClass="table table-full" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+			<div class="table-header">
 				<h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
 			</div>
 
@@ -26,26 +38,11 @@
 
 				<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
+				<div class="table-footer">
+					<p:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<p:commandButton styleClass="submit" type="submit" id="submit_change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
 				</div>
 			</h:form>
 		</h:panelGroup>
-
-		<ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}">
-			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-				<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
-				<ui:param name="styleClass" value="errors" />
-			</ui:include>
-		</ui:fragment>
-
-		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-		</ui:fragment>
-
-		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-		</ui:fragment>
 	</ui:define>
 </ui:composition>