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 a4b50d33106682b687bc98e160f76d01ea037ec1..fc370b845afd1a2bd5e2e22aae93f5f520890966 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
                </ui:define>
 
                <ui:define name="content">
@@ -38,10 +40,10 @@
                                                                        </div>
 
                                                                        <div class="clear"></div>
-                                                               </div>
 
-                                                               <div class="error_container">
-                                                                       <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       <div class="error_container">
+                                                                               <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
                                                                </div>
 
                                                                <div class="table_row">
@@ -70,10 +72,10 @@
                                                                        </div>
 
                                                                        <div class="clear"></div>
-                                                               </div>
 
-                                                               <div class="error_container">
-                                                                       <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       <div class="error_container">
+                                                                               <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
                                                                </div>
                                                        </fieldset>
                                                </div>