Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / login / user / user_enter_current_password.tpl

diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 9a732b38c2a1107ada64927e5259b2ad1ea6282c..97a4e7c992f38a16f04ea9e8d3283cd7ee1a932a 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -5,23 +5,29 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="para">
-               <fieldset id="current_password">
-                       <legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}</legend>
-                       <div class="table_row">
+       <h:panelGroup styleClass="para" layout="block">
+               <fieldset class="fieldset" id="current_password">
+                       <legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
+                       </legend>
+
+                       <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left">
                                        <h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
                                </div>
 
                                <div class="table_right">
-                                       <h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
-                                               <h:message for="currentPassword" styleClass="errors" />
-                                               <!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
+                                       <h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
+                                               <!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
                                        </h:inputSecret>
                                </div>
 
                                <div class="clear"></div>
-                       </div>
+
+                               <h:panelGroup styleClass="error_container" layout="block">
+                                       <h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               </h:panelGroup>
+                       </h:panelGroup>
                </fieldset>
-       </div>
+       </h:panelGroup>
 </ui:composition>