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 e05b336f1216d2ff1a3460bc9c7835c70747d8ac..38fcfdbcd35e3b3270ca6dbce8bd6c84917c609d 100644 (file)
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -7,17 +6,19 @@
           xmlns:h="http://xmlns.jcp.org/jsf/html"
           xmlns:f="http://xmlns.jcp.org/jsf/core">
  
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
+               <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">
-                       <div class="table_big">
+                       <h:panelGroup styleClass="table_full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
                                 <div class="table_header">
-                                       #{msg.TABLE_HEADER_USER_LIST}
+                                       <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()}">
@@ -33,7 +34,14 @@
                                                 <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
                                         </h:column>
                                 </h:dataTable>
-                       </div>
+                       </h:panelGroup>>
+
+                       <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>