<?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">
+ 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_PASSWORD}" />
</ui:define>
- <ui:define name="content_header">
+ <ui:define name="login_content_header">
<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD}" />
</ui:define>
<ui:define name="content">
- <ui:fragment rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}">
- <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
- <ui:param name="message" value="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" />
- </ui:include>
+ <widgets:outputMessageBox id="login-user-must-change-password" message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
+
+ <widgets:outputMessageBox id="error-user-edit-data-disabled" 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" />
</ui:fragment>
<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">
+ <fieldset class="fieldset">
<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:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
+ <h:panelGroup styleClass="table-row" layout="block">
+ <div class="table-left">
+ <p:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
</div>
- <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 class="table-right">
+ <p:inputText type="secret" 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:panelGroup styleClass="error-container" layout="block">
+ <p:message for="userPassword" />
</h:panelGroup>
- <h:panelGroup styleClass="table_row" layout="block">
- <div class="table_left">
- <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
+ <h:panelGroup styleClass="table-row" layout="block">
+ <div class="table-left">
+ <p:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
</div>
- <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 class="table-right">
+ <p:inputText type="secret" 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:panelGroup styleClass="error-container" layout="block">
+ <p:message for="userPasswordRepeat" />
</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}" />
- <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
+ <div class="table-footer">
+ <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <p:commandButton styleClass="submit" type="submit" id="submit_change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
</div>
- </h:form>
- </h:panelGroup>
- </ui:fragment>
-
- <ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
- <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="#{not userLoginController.isUserLoggedIn()}">
- <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+ </h:panelGroup>
+ </h:form>
</ui:fragment>
</ui:define>
</ui:composition>
projects / jjobs-war.git / blobdiff