Please cherry-pick:

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

diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index 254d07c8b8962e4984dd63684f9359d89d0d4934..dc647b75027143a7434c02c5860ab863723a1f36 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -17,6 +17,12 @@
                </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>
+                       </ui:fragment>
+
                        <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
                                        <div class="table_header">
@@ -32,23 +38,7 @@
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
-                                                                               <h:outputLabel for="userCurrentPassword" value="#{msg.GUEST_REGISTRATION_ENTER_CURRENT_PASSWORD}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputSecret styleClass="input" id="userCurrentPassword" size="10" maxlength="255" value="#{userPasswordController.userCurrentPassword}" required="true" requiredMessage="#{msg.USER_CURRENT_PASSWORD_REQUIRED}" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-
-                                                                       <div class="error_container">
-                                                                               <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                                       </div>
-                                                               </div>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
+                                                                               <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
                                                                        </div>
 
                                                                        <div class="table_right">
@@ -58,13 +48,13 @@
                                                                        <div class="clear"></div>
                                                                </div>
 
-                                                               <div class="error_container">
+                                                               <h:panelGroup styleClass="error_container" layout="block">
                                                                        <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                               </div>
+                                                               </h:panelGroup>
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
-                                                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
+                                                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
                                                                        </div>
 
                                                                        <div class="table_right">
@@ -72,11 +62,11 @@
                                                                        </div>
 
                                                                        <div class="clear"></div>
-
-                                                                       <div class="error_container">
-                                                                               <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                                       </div>
                                                                </div>
+
+                                                               <h:panelGroup styleClass="error_container" layout="block">
+                                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                               </h:panelGroup>
                                                        </fieldset>
                                                </div>
 
@@ -84,7 +74,7 @@
 
                                                <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_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
                                                </div>
                                        </h:form>
                                </h:panelGroup>