Please cherry-pick:

[jjobs-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 842385a2be77591e93d3bbe4604635f1c1399ba1..2848da6229edf99de49346ab332184e1cf872631 100644 (file)
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -2,9 +2,11 @@
 <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
                                xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+                               xmlns:links="http://mxchange.org/jsf/core/links"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+                               xmlns:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
 
        <ui:define name="login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
@@ -15,32 +17,32 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:panelGroup styleClass="table_full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
-                       <div class="table_header">
+               <widgets:outputMessageBox id="error-user-list-disabled" message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
+
+               <h:panelGroup styleClass="table 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">
-                                               <h:outputText value="#{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">
-                                               <h:outputText value="#{msg.USER_CREATED}" />
-                                       </f:facet>
-
-                                       <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
-                               </h:column>
-                       </h:dataTable>
+                       <p:dataTable id="userList" var="user" value="#{userController.allUsers()}" tableStyleClass="table" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.allUsers().size() lt 0}">
+                               <ui:fragment rendered="#{profileController.isProfileLinkVisibleByUser(user)}">
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.USER_NAME}" />
+                                               </f:facet>
+
+                                               <links:outputUserProfileLink user="#{user}" />
+                                       </p:column>
+
+                                       <p:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.USER_CREATED}" />
+                                               </f:facet>
+
+                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+                                       </p:column>
+                               </ui:fragment>
+                       </p:dataTable>
                </h:panelGroup>>
-
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
        </ui:define>
 </ui:composition>