X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fuser%2Fadmin_user_activity_log.xhtml;h=12f2fb9612fe71ff8bd6c46433238449011ab9ea;hb=8804ce096028f160185edb4ed56b08026b571ba7;hp=88ff48a375facf443eee05a6f09f37469ec482e9;hpb=6f5254b0845e0bf2bcc10194aed7c6065104abce;p=pizzaservice-war.git

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 88ff48a3..12f2fb96 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -1,113 +1,107 @@
-<!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}"
-	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"
-	>
-
-	<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.copyUserToController()}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">
-			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
-		</ui:define>
-
-		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{empty beanHelper.user}">
-				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
-					<ui:param name="styleClass" value="errors" />
-				</ui:include>
-			</ui:fragment>
-
-			<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>
-					<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}">
-						<f:param name="userId" value="#{userActivity.activityUser.userId}" />
-					</h:link>
-				</h:column>
-
-				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-					<h:column>
-						<f:facet name="header">
-							<h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
-						</f:facet>
-
-						<h:outputText value="#{userActivity.activityUserName}" />
-					</h:column>
-				</ui:fragment>
-
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_SHOW_PRINCIPAL_NAME}" />
-					</f:facet>
-
-					<h:outputText value="#{userActivity.activityPrincipalName}" />
-				</h:column>
-
-				<h: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>
-
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
-					</f:facet>
-
-					<h:outputText value="#{userActivity.activityContactFirstName}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
-					</f:facet>
-
-					<h:outputText value="#{userActivity.activityContactFamilyName}" />
-				</h:column>
-
+<?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: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:metadata>
+	</ui:define>
+
+	<ui:define name="admin_title">
+		<h:outputText value="#{msg.PAGE_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
+	</ui:define>
+
+	<ui:define name="content_header">
+		<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_USER_ACTIVITY_LOG}" />
+	</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>
+				<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}">
+					<f:param name="userId" value="#{userActivity.activityUser.userId}" />
+				</h:link>
+			</h:column>
+
+			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 				<h:column>
 					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_MESSAGE}" />
+						<h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
 					</f:facet>
 
-					<h:outputText value="#{userActivity.activityMessage}" />
+					<h:outputText value="#{userActivity.activityUserName}" />
 				</h:column>
+			</ui:fragment>
 
-				<h: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>
-
-				<h: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>
-				</h:column>
-			</h:dataTable>
-		</ui:define>
-	</ui:composition>
-</html>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_SHOW_PRINCIPAL_NAME}" />
+				</f:facet>
+
+				<h:outputText value="#{userActivity.activityPrincipalName}" />
+			</h:column>
+
+			<h: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>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
+				</f:facet>
+
+				<h:outputText value="#{userActivity.activityContactFirstName}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
+				</f:facet>
+
+				<h:outputText value="#{userActivity.activityContactFamilyName}" />
+			</h:column>
+
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_MESSAGE}" />
+				</f:facet>
+
+				<h:outputText value="#{userActivity.activityMessage}" />
+			</h:column>
+
+			<h: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>
+
+			<h: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>
+			</h:column>
+		</h:dataTable>
+	</ui:define>
+</ui:composition>
