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 6097ba39671f13a02b339b7dc98b041f12461243..cfbada39537d9779e69583a35a8864a66631f6b2 100644 (file)
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:generic="http://mxchange.org/jsf/core"
+                               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">
@@ -19,7 +19,7 @@
                        <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>
 
@@ -28,37 +28,33 @@
                                                                <h:outputText value="#{msg.GUEST_LOST_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="id" value="#{msg.ENTER_USER_NAME}" />
                                                                </div>
 
-                                                               <div class="table_right">
+                                                               <div class="table-right">
                                                                        <h: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:panelGroup styleClass="table-row" layout="block">
+                                                               <div class="table-left">
                                                                        <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
                                                                </div>
 
-                                                               <div class="table_right">
+                                                               <div class="table-right">
                                                                        <h: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}" />
+                                               <div class="table-footer">
+                                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                        <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
                                                </div>
                                        </h:panelGroup>
@@ -66,6 +62,6 @@
                        </div>
                </ui:fragment>
 
-               <generic: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')}" />
+               <widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
        </ui:define>
 </ui:composition>