Please cherry-pick:

[jjobs-war.git] / web / user / login_user_change_password.xhtml

diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index ec60486833fe8946daf3e0078f09df9f9d46e77c..b5b03ba6b09d6012031f8a43930a1b85fb275a7d 100644 (file)
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -4,20 +4,21 @@
                                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">
-               <widgets:outputMessageBox message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
+               <widgets:outputMessageBox id="login-user-must-change-password" message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
 
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+               <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" />
@@ -30,37 +31,37 @@
                                                <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}" />
+                                                               <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}" />
+                                                               <p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
                                                        </div>
                                                </h:panelGroup>
 
-                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                                               <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}" />
+                                                               <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}" />
+                                                               <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>
                                                </h:panelGroup>
 
-                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+                                               <h:panelGroup styleClass="error-container" layout="block">
+                                                       <p:message for="userPasswordRepeat" />
                                                </h:panelGroup>
                                        </fieldset>
 
@@ -70,8 +71,8 @@
                                        <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
                                        <div class="table-footer">
-                                               <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="button_change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
+                                               <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:panelGroup>
                        </h:form>