From 3b31c03020c8c463c3fd89add2f9457ddf69a247 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 15 Oct 2015 17:06:18 +0200
Subject: [PATCH] h:outputText can do the same as ui:fragment and is a better
 choice as ui:fragment is for repeated content

---
 web/login/login_list_sharing_addressbooks.xhtml |  8 ++++----
 web/login/login_show_addressbook.xhtml          |  8 ++++----
 web/user/user_list.xhtml                        | 16 +++++++++-------
 web/user/user_profile.xhtml                     |  8 ++++----
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/web/login/login_list_sharing_addressbooks.xhtml b/web/login/login_list_sharing_addressbooks.xhtml
index 471a1f18..d2064dd4 100644
--- a/web/login/login_list_sharing_addressbooks.xhtml
+++ b/web/login/login_list_sharing_addressbooks.xhtml
@@ -21,13 +21,13 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<ui:fragment rendered="#{shareController.isShareeUserIdSet()}">
+			<h:outputText rendered="#{shareController.isShareeUserIdSet()}">
 				Here goes your content.
-			</ui:fragment>
+			</h:outputText>
 
-			<ui:fragment rendered="#{shareController.isShareeUserIdEmpty()}">
+			<h:outputText rendered="#{shareController.isShareeUserIdEmpty()}">
 				<ui:include src="/WEB-INF/templates/generic/userid_error.tpl" />
-			</ui:fragment>
+			</h:outputText>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/login/login_show_addressbook.xhtml b/web/login/login_show_addressbook.xhtml
index 0d2b78bd..27c9e27d 100644
--- a/web/login/login_show_addressbook.xhtml
+++ b/web/login/login_show_addressbook.xhtml
@@ -53,12 +53,12 @@
 				</div>
 
 				<div class="table_footer">
-					<ui:fragment rendered="#{addressbookController.isOwnAddressbook()}">
+					<h:outputText rendered="#{addressbookController.isOwnAddressbook()}">
 						<h:link id="startSharing" outcome="login_start_sharing_addressbook" value="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK_TITLE}" />
-					</ui:fragment>
-					<ui:fragment rendered="#{addressbookController.isOtherAddressbook()}">
+					</h:outputText>
+					<h:outputText rendered="#{addressbookController.isOtherAddressbook()}">
 						Bla bla
-					</ui:fragment>
+					</h:outputText>
 				</div>
 			</div>
 		</ui:define>
diff --git a/web/user/user_list.xhtml b/web/user/user_list.xhtml
index 3a03a20c..9ccd8732 100644
--- a/web/user/user_list.xhtml
+++ b/web/user/user_list.xhtml
@@ -6,7 +6,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/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
 
 		<ui:define name="content_header">
@@ -41,12 +41,14 @@
 						</h:outputFormat>
 					</h:column>
 
-					<h:column>
-						<f:facet name="header">#{msg.USER_LIST_SHARING_ADDRESSBOOKS}</f:facet>
-						<h:link outcome="login_list_sharing_addressbooks" value="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS}" title="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS_TITLE}">
-							<f:param name="userId" value="#{user.userId}" />
-						</h:link>
-					</h:column>
+					<h:outputText rendered="#{loginController.userLoggedIn}">
+						<h:column>
+							<f:facet name="header">#{msg.USER_LIST_SHARING_ADDRESSBOOKS}</f:facet>
+							<h:link outcome="login_list_sharing_addressbooks" value="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS}" title="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS_TITLE}">
+								<f:param name="userId" value="#{user.userId}" />
+							</h:link>
+						</h:column>
+					</h:outputText>
 				</h:dataTable>
 			</div>
 		</ui:define>
diff --git a/web/user/user_profile.xhtml b/web/user/user_profile.xhtml
index fc0f1200..4803fbac 100644
--- a/web/user/user_profile.xhtml
+++ b/web/user/user_profile.xhtml
@@ -21,13 +21,13 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<ui:fragment rendered="#{shareController.isShareeUserIdSet()}">
+			<h:outputText rendered="#{shareController.isShareeUserIdSet()}">
 				Here goes your content.
-			</ui:fragment>
+			</h:outputText>
 
-			<ui:fragment rendered="#{shareController.isShareeUserIdEmpty()}">
+			<h:outputText rendered="#{shareController.isShareeUserIdEmpty()}">
 				<ui:include src="/WEB-INF/templates/generic/userid_error.tpl" />
-			</ui:fragment>
+			</h:outputText>
 		</ui:define>
 	</ui:composition>
 </html>
-- 
2.39.5