From a592ac8606653587d37f29da4d3a6f26144d4ea4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Apr 2017 00:28:06 +0200
Subject: [PATCH] other projects will have more than one login, not just users
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/user/login_list_sharing_addressbooks.xhtml |  4 ++--
 web/user/login_other_addressbooks.xhtml        |  4 ++--
 web/user/login_own_addressbooks.xhtml          |  2 +-
 web/user/login_shared_addressbooks.xhtml       |  4 ++--
 web/user/login_start_sharing_addressbook.xhtml | 12 ++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/web/user/login_list_sharing_addressbooks.xhtml b/web/user/login_list_sharing_addressbooks.xhtml
index d4c14399..9947fdd5 100644
--- 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 1c8bf5c0..98972dad 100644
--- 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 7b2e5261..b61d71f6 100644
--- 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 455c3a9d..70df9517 100644
--- 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 0409b513..6eb82de6 100644
--- 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>
-- 
2.39.5