updated jar(s)

[pizzaservice-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 fe0e40369bc8f39fa87504466cbf47857ffca77f..847c662334024ff2ab811d0b9d644da3fa7a8785 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -16,7 +16,7 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('edit_user_data')}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_password')}">
                                        <div class="table">
                                                <div class="table_header">
                                                        <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
@@ -29,42 +29,66 @@
                                                                                <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
                                                                        </legend>
 
+                                                                       <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>
+
+                                                                       <div class="error_container">
+                                                                               <h:message for="userCurrentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
+
                                                                        <div class="table_row">
                                                                                <div class="table_left">
                                                                                        <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
                                                                                </div>
 
                                                                                <div class="table_right">
-                                                                                       <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
+                                                                                       <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>
                                                                        </div>
 
+                                                                       <div class="error_container">
+                                                                               <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
+
                                                                        <div class="table_row">
                                                                                <div class="table_left">
                                                                                        <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
                                                                                </div>
 
                                                                                <div class="table_right">
-                                                                                       <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
+                                                                                       <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>
                                                                        </div>
+
+                                                                       <div class="error_container">
+                                                                               <h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                                                                       </div>
                                                                </fieldset>
                                                        </div>
 
                                                        <div class="table_footer">
                                                                <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                               <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.doChangePassword()}" />
+                                                               <h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
                                                        </div>
                                                </h:form>
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-                                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+                                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
                                </ui:fragment>
 
                                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">