Continued generally:

[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 e4c623c1f957994ef120297b9a8087eebaf9ecff..aef02c12cff9ce4342062f581287b3061e85c1b5 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -8,7 +8,7 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+       <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="content_header">
@@ -29,11 +29,11 @@
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
-                                                                               <h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
+                                                                               <h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
+                                                                               <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
@@ -41,11 +41,11 @@
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
-                                                                               <h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />
+                                                                               <h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               <h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
+                                                                               <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
                                                                        </div>
 
                                                                        <div class="clear"></div>
@@ -53,18 +53,18 @@
                                                        </fieldset>
                                                </div>
 
-                                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+                                               <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
                                                <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
+                                                       <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.changePassword()}" />
                                                </div>
                                        </h:form>
                                </div>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>
        </ui:composition>