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 1cd19d203f5e2c279f4e50ed5555e59a6afff83c..780d0119b97fb32693d57e009c70799217cfac5a 100644 (file)
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -14,7 +14,7 @@
                </ui:define>
 
                <ui:define name="content_header">
-                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
+                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD}" />
                </ui:define>
 
                <ui:define name="content">
@@ -31,45 +31,46 @@
                                        </div>
 
                                        <h:form id="form_user_change_password">
-                                               <div class="para">
-                                                       <fieldset class="fieldset" id="change_password">
-                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
-                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
-                                                               </legend>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
-                                                                       </div>
-
-                                                                       <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>
+
+                                               <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:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
                                                                </div>
 
-                                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                               </h:panelGroup>
+                                                               <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="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
-                                                                       </div>
+                                                               <div class="clear"></div>
+                                                       </h:panelGroup>
 
-                                                                       <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>
+                                                       <h:panelGroup styleClass="error_container" layout="block">
+                                                               <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                       </h:panelGroup>
 
-                                                                       <div class="clear"></div>
+                                                       <h:panelGroup styleClass="table_row" layout="block">
+                                                               <div class="table_left">
+                                                                       <h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
                                                                </div>
 
-                                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                               </h:panelGroup>
-                                                       </fieldset>
-                                               </div>
+                                                               <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:panelGroup>
+                                               </fieldset>
+
+                                               <div class="para"></div>
 
                                                <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />