h:outputText can do the same as ui:fragment and is a better choice as ui:fragment...

diff --git a/web/login/login_list_sharing_addressbooks.xhtml b/web/login/login_list_sharing_addressbooks.xhtml
index 471a1f18374c6b081bd5bc5fe8c07a9666359966..d2064dd426fc98a65020f3076e79e085c3a93a34 100644 (file)
--- 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 0d2b78bd72e756de9af55cf56bd62164bf5deb25..27c9e27da63034447339675248c8aa6d0c1da706 100644 (file)
--- 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 3a03a20ce51fff13e6a6efc1e06ef180e0119868..9ccd87328e4573c26a1b2ab622dcf7d73d732644 100644 (file)
--- 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 fc0f120007aca8d3ee3a8bded2b3dc8e92d0c044..4803fbac1c045e9394211eb489411999e5023c66 100644 (file)
--- 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>