other projects will have more than one login, not just users

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/user/login_list_sharing_addressbooks.xhtml b/web/user/login_list_sharing_addressbooks.xhtml
index d4c143999042a22a41b4c59b9bc9033a9f5c58c5..9947fdd5ef7910990f25edf5d2a0e1e52d4d8fa1 100644 (file)
--- a/web/user/login_list_sharing_addressbooks.xhtml
+++ b/web/user/login_list_sharing_addressbooks.xhtml
@@ -25,7 +25,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <ui:fragment rendered="#{shareController.isShareeUserIdSet()}">
                                        Here goes your content.
                                </ui:fragment>
@@ -35,7 +35,7 @@
                                </ui:fragment>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>

diff --git a/web/user/login_other_addressbooks.xhtml b/web/user/login_other_addressbooks.xhtml
index 1c8bf5c084e9bf9d0c032afa44b3fc82e4be83d7..98972dad53f652025a49b4612bc19af9b2f3af58 100644 (file)
--- a/web/user/login_other_addressbooks.xhtml
+++ b/web/user/login_other_addressbooks.xhtml
@@ -18,11 +18,11 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                Here goes your content.
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>

diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml
index 7b2e52617862a6a46ed59dfd60d28bdf0c2241bf..b61d71f6b9674cb8bfeea2dedc43ada752853f16 100644 (file)
--- a/web/user/login_own_addressbooks.xhtml
+++ b/web/user/login_own_addressbooks.xhtml
@@ -18,7 +18,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}" />

diff --git a/web/user/login_shared_addressbooks.xhtml b/web/user/login_shared_addressbooks.xhtml
index 455c3a9dcd492a1284085fb9227f97233a197064..70df95179bd255a05248804385666cc2be6dd19f 100644 (file)
--- a/web/user/login_shared_addressbooks.xhtml
+++ b/web/user/login_shared_addressbooks.xhtml
@@ -17,7 +17,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS}" />
@@ -68,7 +68,7 @@
                                </div>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>

diff --git a/web/user/login_start_sharing_addressbook.xhtml b/web/user/login_start_sharing_addressbook.xhtml
index 0409b51303736becce5c3d775ed6e9d11977af30..6eb82de650afa1920e0d698489d949cd066fbf3f 100644 (file)
--- a/web/user/login_start_sharing_addressbook.xhtml
+++ b/web/user/login_start_sharing_addressbook.xhtml
@@ -8,7 +8,7 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
                <ui:define name="login_title">
                        <h:outputText value="#{msg.PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK}" />
                </ui:define>
@@ -18,7 +18,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table_big">
 
                                        <div class="table_header">
@@ -26,9 +26,9 @@
                                        </div>
 
                                        <div class="para">
-                                               <h:outputText id="userNotLoggedIn" class="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not loginController.isUserLoggedIn()}" />
+                                               <h:outputText id="userNotLoggedIn" class="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not userLoginController.isUserLoggedIn()}" />
 
-                                               <h:dataTable id="userList" headerClass="table_header_column" var="user" value="#{addressbookController.allUsersNotSharing()}" rendered="#{loginController.isUserLoggedIn() and not empty addressbookController.addressbook and not loginController.isInvisible()}">
+                                               <h:dataTable id="userList" headerClass="table_header_column" var="user" value="#{addressbookController.allUsersNotSharing()}" rendered="#{userLoginController.isUserLoggedIn() and not empty addressbookController.addressbook and not userLoginController.isInvisible()}">
 
                                                        <h:column>
                                                                <f:facet name="header">
@@ -61,7 +61,7 @@
 
                                                <h:outputText id="addressbokUnset" class="notice" value="#{msg.LOGIN_ADDRESSBOOK_NOT_SET}" rendered="#{empty addressbookController.addressbook}" />
 
-                                               <h:outputText id="ownProfileInvisible" class="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{loginController.isUserLoggedIn() and not empty addressbookController.addressbook and not loginController.isInvisible()}" />
+                                               <h:outputText id="ownProfileInvisible" class="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{userLoginController.isUserLoggedIn() and not empty addressbookController.addressbook and not userLoginController.isInvisible()}" />
                                        </div>
 
                                        <div class="table_footer">
@@ -73,7 +73,7 @@
                                </div>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
                        </ui:fragment>
                </ui:define>