Continued a bit:

[addressbook-war.git] / web / user / login_change_personal_data.xhtml
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml

index e4c482c9b25bb0ba13943ceea40308a5cd3fa143..21dbf0243de64561435bd3e0d75e154d9d95de87 100644 (file)
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -8,7 +7,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_PERSONAL_DATA}</ui:define>
  
                 <ui:define name="content_header">
@@ -23,22 +22,22 @@
                                         </div>
  
                                         <h:form id="login_change_personal_form">
-                                               <ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
+                                               <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
  
-                                               <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" />
  
                                                 <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="#{userController.doChangePersonalData()}" />
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
                                                 </div>
                                         </h:form>
                                 </div>
                         </ui:fragment>
  
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                         </ui:fragment>
                 </ui:define>
         </ui:composition>