removed double-redundant XML parsing instructions, (X)HTML doesn't want it anyway

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

index 8cd727cbbea7285a88ecce46ae21c27d7c69603f..f0ff37795a6d0fb17288d43548fdc7f44b6f3ee7 100644 (file)
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_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_EDIT_USER_DATA}</ui:define>
  
                 <ui:define name="content_header">
@@ -42,8 +41,8 @@
                                 </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>