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 35f7cdaf8e7734576aa61a24a3ce003ed97ac0c5..829bb87eebb1c13bdc011be7557bd3eb2a6b1e2f 100644 (file)
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -18,64 +18,60 @@
                <widgets:outputMessageBox message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
 
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                       <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
-                               <div class="table_header">
-                                       <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
-                               </div>
-
-                               <h:form id="form_user_change_password">
+                       <h:form id="form_user_change_password">
+                               <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
+                                       <div class="table-header">
+                                               <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
+                                       </div>
 
                                        <fieldset class="fieldset" id="change_password">
                                                <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:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left">
                                                                <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
                                                        </div>
 
-                                                       <div class="table_right">
+                                                       <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}" />
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
 
-                                               <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="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
                                                        </div>
 
-                                                       <div class="table_right">
+                                                       <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}" />
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       <h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                                                </h:panelGroup>
                                        </fieldset>
 
+                                       <!-- @TODO Get rid of this ugly class=para abuse -->
                                        <div class="para"></div>
 
                                        <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-                                       <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" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
                                        </div>
-                               </h:form>
-                       </h:panelGroup>
+                               </h:panelGroup>
+                       </h:form>
                </ui:fragment>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+               <widgets:outputMessageBox 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" />