use user controller + use current password template

[addressbook-war.git] / web / login / login_change_email_address.xhtml

diff --git a/web/login/login_change_email_address.xhtml b/web/login/login_change_email_address.xhtml
index a5db8b0eaee4a08df00ebb2a6677e65bf04189b9..1dbb0f27e20b35a2f3c8d275abd7043e62b9acdd 100644 (file)
--- a/web/login/login_change_email_address.xhtml
+++ b/web/login/login_change_email_address.xhtml
@@ -26,7 +26,7 @@
                                                </div>
 
                                                <div class="para">
-                                                       <fieldset id="login_data">
+                                                       <fieldset id="change_email">
                                                                <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_EMAIL_LEGEND}</legend>
 
                                                                <div class="table_row">
@@ -52,26 +52,14 @@
 
                                                                        <div class="clear"></div>
                                                                </div>
-
-                                                               <div class="para"></div>
-
-                                                               <div class="table_row">
-                                                                       <div class="table_left">
-                                                                               <h:outputLabel for="password" value="#{msg.LOGIN_ENTER_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>
                                                        </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_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>