Updated copyright year

[addressbook-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 12f2fb9612fe71ff8bd6c46433238449011ab9ea..e0ec4c6dbd2e725c031a3c975e6428434e4f9948 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </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,86 +31,96 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" 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()}"
+                       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}" />
+                                       <h:outputText value="#{msg.DATA_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"
+                                       value="#{userActivity.activityUser.userId}"
+                                       title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                       >
                                        <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}" />
+                                               <h:outputText value="#{msg.DATA_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_ACTIVIRY_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_ACTIVIRY_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>
 
-                               <h:outputText id="userCreated" value="#{userActivity.activityTimestamp.time}">
-                                       <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+                               <h:outputText value="#{userActivity.activityTimestamp}">
+                                       <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                </h:outputText>
-                       </h:column>
-               </h:dataTable>
+                       </p:column>
+               </p:dataTable>
        </ui:define>
 </ui:composition>