Please cherry-pick:

[jjobs-war.git] / web / guest / user / user_lost_password.xhtml

diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index 0896b864f82c1dc40d030334c52b047a64c9addb..25eaeb728fc173e9ec43894f961a00483b543553 100644 (file)
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -4,9 +4,10 @@
                                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="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
        </ui:define>
 
@@ -15,57 +16,53 @@
        </ui:define>
 
        <ui:define name="content">
+               <widgets:outputMessageBox id="error-user-recovery-disabled" message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
+
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
                        <div id="user_lost_password_content">
                                <h:form id="form_lost_password">
                                        <h:panelGroup styleClass="table" layout="block">
-                                               <div class="table_header">
+                                               <div class="table-header">
                                                        <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
                                                </div>
 
-                                               <fieldset class="fieldset" id="login_data">
+                                               <fieldset class="fieldset">
                                                        <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">
                                                                <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
                                                        </legend>
 
-                                                       <h:panelGroup styleClass="table_row" layout="block">
-                                                               <div class="table_left">
-                                                                       <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
+                                                       <h:panelGroup styleClass="table-row" layout="block">
+                                                               <div class="table-left">
+                                                                       <p:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
                                                                </div>
 
-                                                               <div class="table_right">
-                                                                       <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+                                                               <div class="table-right">
+                                                                       <p:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
                                                                </div>
-
-                                                               <div class="clear"></div>
                                                        </h:panelGroup>
 
-                                                       <div class="table_header">
+                                                       <div class="table-header">
                                                                <h:outputText value="#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}" />
                                                        </div>
 
-                                                       <h:panelGroup styleClass="table_row" layout="block">
-                                                               <div class="table_left">
-                                                                       <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
+                                                       <h:panelGroup styleClass="table-row" layout="block">
+                                                               <div class="table-left">
+                                                                       <p:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
                                                                </div>
 
-                                                               <div class="table_right">
-                                                                       <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+                                                               <div class="table-right">
+                                                                       <p:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
                                                                </div>
-
-                                                               <div class="clear"></div>
                                                        </h:panelGroup>
                                                </fieldset>
 
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
+                                               <div class="table-footer">
+                                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
                                                </div>
                                        </h:panelGroup>
                                </h:form>
                        </div>
                </ui:fragment>
-
-               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
        </ui:define>
 </ui:composition>