Please cherry-pick:

[jjobs-war.git] / web / admin / user / admin_user_activity_log.xhtml

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 417aa97d349e56949389b123298d6efcb09b2fdc..319d10e605f4f6a054c9c96573d23697eb67d0ca 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -4,7 +4,8 @@
                                xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                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="metadata">
                <f:metadata>
@@ -13,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
        </ui:define>
 
@@ -22,78 +23,78 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+               <widgets:outputMessageBox id="error-helper-user" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
-               <h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
-                       <h:column>
+               <p:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
                                </f:facet>
 
-                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
+                               <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{userActivity.activityUser.userId}">
                                        <f:param name="userId" value="#{userActivity.activityUser.userId}" />
-                               </h:link>
-                       </h:column>
+                               </p:link>
+                       </p:column>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                               <h:column>
+                               <p:column>
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
                                        </f:facet>
 
                                        <h:outputText value="#{userActivity.activityUserName}" />
-                               </h:column>
+                               </p:column>
                        </ui:fragment>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_SHOW_PRINCIPAL_NAME}" />
                                </f:facet>
 
                                <h:outputText value="#{userActivity.activityPrincipalName}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_PERSONAL_TITLE}" />
                                </f:facet>
 
                                <h:outputText value="#{msg[userActivity.activityContactGender.messageKey]}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
                                </f:facet>
 
                                <h:outputText value="#{userActivity.activityContactFirstName}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
                                </f:facet>
 
                                <h:outputText value="#{userActivity.activityContactFamilyName}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_MESSAGE}" />
                                </f:facet>
 
                                <h:outputText value="#{userActivity.activityMessage}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TYPE}" />
                                </f:facet>
 
                                <h:outputText value="#{msg[userActivityController.expandAdminActivityType(userActivity.activityType)]}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TIMESTAMP}" />
                                </f:facet>
@@ -101,7 +102,7 @@
                                <h:outputText id="userCreated" value="#{userActivity.activityTimestamp.time}">
                                        <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
                                </h:outputText>
-                       </h:column>
-               </h:dataTable>
+                       </p:column>
+               </p:dataTable>
        </ui:define>
 </ui:composition>