Continued a bit: (please cherry-pick)

[addressbook-war.git] / web / user / login_own_addressbooks.xhtml

diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml
index 48c089735b5959dfd0b6da5382ad139c200de007..126fa9f89634710dc53c90de1ca98bf557c93e95 100644 (file)
--- a/web/user/login_own_addressbooks.xhtml
+++ b/web/user/login_own_addressbooks.xhtml
@@ -8,7 +8,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_OWN_ADDRESSBOOKS}</ui:define>
 
                <ui:define name="content_header">
@@ -59,9 +59,9 @@
                                </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>
+                       <h:outputText rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+                       </h:outputText>
                </ui:define>
        </ui:composition>
 </html>