X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fuser%2Flogin_user_change_password.xhtml;h=829bb87eebb1c13bdc011be7557bd3eb2a6b1e2f;hb=94e98955596609da356846a1c95f4ab3c9b24183;hp=7eddb313727d689ba794486d917d845cc3756e0b;hpb=1d74c2c08b6c7d6e701f67d7262252fd763974a0;p=jjobs-war.git

diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index 7eddb313..829bb87e 100644
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -1,6 +1,7 @@
 <?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:widgets="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">
@@ -14,76 +15,63 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
-			<ui:include src="/WEB-INF/templates/messages/message_box.tpl">
-				<ui:param name="message" value="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" />
-			</ui:include>
-		</ui:fragment>
+		<widgets:outputMessageBox message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
 
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-			<h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
-				<div class="table_header">
-					<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
-				</div>
-
-				<h:form id="form_user_change_password">
+			<h:form id="form_user_change_password">
+				<h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
+					<div class="table-header">
+						<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
+					</div>
 
 					<fieldset class="fieldset" id="change_password">
 						<legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
 							<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_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:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
 							</div>
 
-							<div class="table_right">
+							<div class="table-right">
 								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
 							</div>
-
-							<div class="clear"></div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left">
 								<h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
 							</div>
 
-							<div class="table_right">
+							<div class="table-right">
 								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
 							</div>
-
-							<div class="clear"></div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 					</fieldset>
 
+					<!-- @TODO Get rid of this ugly class=para abuse -->
 					<div class="para"></div>
 
 					<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-					<div class="table_footer">
-						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<div class="table-footer">
+						<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
 					</div>
-				</h:form>
-			</h:panelGroup>
+				</h:panelGroup>
+			</h:form>
 		</ui:fragment>
 
-		<ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
-			<ui:include src="/WEB-INF/templates/messages/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>
+		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />