use user controller + use current password template

diff --git a/web/login/login_change_email_address.xhtml b/web/login/login_change_email_address.xhtml
index 2c9a84b3e8bb455a3950dc66d5fce03e0f7e9525..1dbb0f27e20b35a2f3c8d275abd7043e62b9acdd 100644 (file)
--- a/web/login/login_change_email_address.xhtml
+++ b/web/login/login_change_email_address.xhtml
@@ -59,7 +59,7 @@
 
                                                <div class="table_footer">
                                                        <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{loginController.changeEmailAddress()}" />
+                                                       <h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userController.changeEmailAddress()}" />
                                                </div>
                                        </h:form>
                                </div>

diff --git a/web/login/login_change_password.xhtml b/web/login/login_change_password.xhtml
index 972690067b507efcbf4b738bb6ad058faca64c2b..5b7ff4a7bf6624575eb53cef469aef7a70894dd6 100644 (file)
--- a/web/login/login_change_password.xhtml
+++ b/web/login/login_change_password.xhtml
@@ -29,18 +29,6 @@
                                                        <fieldset id="change_password">
                                                                <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}</legend>
 
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="password" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
-                                                                       </div>
-
-                                                                       <div class="table_right">
-                                                                               <h:inputSecret class="input" id="password" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" />
-                                                                       </div>
-
-                                                                       <div class="clear"></div>
-                                                               </div>
-
                                                                <div class="table_row">
                                                                        <div class="table_left">
                                                                                <h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
@@ -67,9 +55,11 @@
                                                        </fieldset>
                                                </div>
 
+                                               <ui:include src="/WEB-INF/templates/login/login_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="#{loginController.changePassword()}" />
+                                                       <h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
                                                </div>
                                        </h:form>
                                </div>

diff --git a/web/login/login_change_personal_data.xhtml b/web/login/login_change_personal_data.xhtml
index 784772c93dceddc08d770e5fae1033b7ee6916fe..e1711f0defe630c57afbac614d1ef9ec3a215290 100644 (file)
--- a/web/login/login_change_personal_data.xhtml
+++ b/web/login/login_change_personal_data.xhtml
@@ -29,7 +29,7 @@
 
                                                <div class="table_footer">
                                                        <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton class="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{loginController.changePersonalData()}" />
+                                                       <h:commandButton class="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.changePersonalData()}" />
                                                </div>
                                        </h:form>
                                </div>