Please cherry-pick:

[jjobs-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 235cb0722281f23ee29c1e1d7a69ae97439fcf40..b61d71f6b9674cb8bfeea2dedc43ada752853f16 100644 (file)
--- a/web/user/login_own_addressbooks.xhtml
+++ b/web/user/login_own_addressbooks.xhtml
@@ -8,24 +8,28 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS}</ui:define>
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}
+                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}" />
                </ui:define>
 
                <ui:define name="content">
-                       <h:outputText rendered="#{userLoginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
-                                               #{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}
+                                               <h:outputText value="#{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}" />
                                        </div>
 
                                        <div class="para">
                                                <h:dataTable id="table_own_addressbooks" var="addressbook" value="#{addressbookController.allAddressbooks()}" styleClass="table" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS}" rendered="#{addressbookController.hasCreatedAddressbooks()}">
                                                        <h:column>
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
+                                                               <f:facet name="header">
+                                                                       <h:outputText value="#{msg.ADDRESSBOOK_NAME}" />
+                                                               </f:facet>
 
                                                                <h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">
                                                                        <f:param name="addressbookId" value="#{addressbook.addressbookId}" />
@@ -34,7 +38,9 @@
                                                        </h:column>
 
                                                        <h:column>
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_TOTAL_ENTRIES}</f:facet>
+                                                               <f:facet name="header">
+                                                                       <h:outputText value="#{msg.ADDRESSBOOK_TOTAL_ENTRIES}" />
+                                                               </f:facet>
 
                                                                <h:link outcome="show_addressbook_entries" title="#{msg.LINK_SHOW_ADDRESSBOOK_ENTRIES_TITLE}">
                                                                        <f:param name="addressbookId" value="#{addressbook.addressbookId}" />
@@ -43,7 +49,9 @@
                                                        </h:column>
 
                                                        <h:column>
-                                                               <f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>
+                                                               <f:facet name="header">
+                                                                       <h:outputText value="#{msg.ADDRESSBOOK_CREATED}" />
+                                                               </f:facet>
 
                                                                <h:outputFormat id="addressbookCreated" value="#{addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
                                                                        <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
@@ -57,10 +65,10 @@
                                                <h:link id="add_additional_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks()}" />
                                        </div>
                                </div>
-                       </h:outputText>
+                       </ui:fragment>
 
                        <h:outputText rendered="#{not userLoginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                        </h:outputText>
                </ui:define>
        </ui:composition>