X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fuser%2Fadmin_user_activity_log.xhtml;h=19fa0677fb1b6df9abdb195859469e4ee2106da5;hb=265611d4427dc6b698d542239828e9b02905f9de;hp=d46cc09351cc21c65350452af1efc9aaaa3bf69d;hpb=3040b6cdad5db3416ae59543d4f8658403d2bdaf;p=jjobs-war.git

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index d46cc093..19fa0677 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -1,6 +1,7 @@
 <?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">
@@ -8,7 +9,7 @@
 	<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.copyUserToController()}" />
+			<f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
 		</f:metadata>
 	</ui:define>
 
@@ -21,14 +22,9 @@
 	</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}">
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_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>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
@@ -83,7 +79,7 @@
 
 			<h:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_MESSAGE}" />
+					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_MESSAGE}" />
 				</f:facet>
 
 				<h:outputText value="#{userActivity.activityMessage}" />
@@ -91,7 +87,7 @@
 
 			<h:column>
 				<f:facet name="header">
-					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVIRY_LOG_TYPE}" />
+					<h:outputText value="#{msg.ADMIN_LIST_USER_ACTIVITY_LOG_TYPE}" />
 				</f:facet>
 
 				<h:outputText value="#{msg[userActivityController.expandAdminActivityType(userActivity.activityType)]}" />