use user controller + use current password template

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

diff --git a/web/login/login_change_personal_data.xhtml b/web/login/login_change_personal_data.xhtml
index 2a1b4998e7b2b6da20bbfbec05cb2bcb0bb615cf..e1711f0defe630c57afbac614d1ef9ec3a215290 100644 (file)
--- a/web/login/login_change_personal_data.xhtml
+++ b/web/login/login_change_personal_data.xhtml
@@ -17,38 +17,19 @@
                        <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
-                                               #{msg.LOGIN_EDIT_USER_DATA_TITLE}
+                                               #{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}
                                        </div>
 
                                        <h:form id="login_change_personal_form">
-                                               <div class="table_header2">
-                                                       #{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}
-                                               </div>
-
                                                <ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
 
-                                               <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
+                                               <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-                                               <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">
-                                                                       <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/guest/guest_privacy_terms.tpl" />
 
                                                <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>