Please cherry-pick:

[pizzaservice-war.git] / web / guest / user / user_list.xhtml

diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index ba5819161505825c39b18cb599a37e77ad096284..38fcfdbcd35e3b3270ca6dbce8bd6c84917c609d 100644 (file)
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -7,35 +7,41 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core">
 
        <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LIST}
+                       <h:outputText value="#{msg.CONTENT_TITLE_USER_LIST}" />
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_list')}">
-                               <div class="table_big">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
-                                       </div>
+                       <h:panelGroup styleClass="table_full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
+                               <div class="table_header">
+                                       <h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
+                               </div>
 
-                                       <h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
-                                               <h:column>
-                                                       <f:facet name="header">#{msg.USER_NAME}</f:facet>
-                                                       <ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
-                                                               <ui:param name="user" value="#{user}" />
-                                                       </ui:include>
-                                               </h:column>
+                               <h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
+                                       <h:column>
+                                               <f:facet name="header">#{msg.USER_NAME}</f:facet>
+                                               <ui:include src="/WEB-INF/templates/user/user_profile_link.tpl">
+                                                       <ui:param name="user" value="#{user}" />
+                                               </ui:include>
+                                       </h:column>
 
-                                               <h:column>
-                                                       <f:facet name="header">#{msg.USER_CREATED}</f:facet>
-                                                       <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
-                                               </h:column>
-                                       </h:dataTable>
-                               </div>
+                                       <h:column>
+                                               <f:facet name="header">#{msg.USER_CREATED}</f:facet>
+                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+                                       </h:column>
+                               </h:dataTable>
+                       </h:panelGroup>>
 
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_USER_LIST_DISABLED}" rendered="#{featureController.isFeatureEnabled('user_list')}" />
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_list')}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ERROR_USER_LIST_DISABLED}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
                </ui:define>
        </ui:composition>
 </html>