Please cherry-pick:

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

diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
index df867ca2249e01ad504f27e43a11f94b86238285..d7db1d1266827f04da321d69c8956cd501034c70 100644 (file)
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -8,22 +8,24 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}" />
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
                                <div class="para" id="user_lost_password_content">
                                        <h:form id="form_lost_password">
-                                               <div class="table">
+                                               <h:panelGroup styleClass="table" layout="block">
                                                        <div class="table_header">
                                                                <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
                                                        </div>
 
-                                                       <fieldset id="login_data">
+                                                       <fieldset class="fieldset" id="login_data">
                                                                <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">
                                                                        <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
                                                                </legend>
@@ -59,15 +61,15 @@
                                                        </fieldset>
 
                                                        <div class="table_footer">
-                                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                               <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>
-                                               </div>
+                                               </h:panelGroup>
                                        </h:form>
                                </div>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not userController.isUserNameRequired()}">
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required') or not featureController.isFeatureEnabled('user_password_recovery')}">
                                <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
                        </ui:fragment>
                </ui:define>