Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / user / admin_show_user_data.tpl

diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
index e6287b7367bfd3c979c52ad914c642272dbea1eb..28f60d9e1a25b045e0967541888ba395762c19b3 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
@@ -1,74 +1,83 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.user}">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <p:panelGrid
+               columns="3"
+               rendered="#{not empty beanHelper.user}"
+               >
                <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
+                       <h:outputFormat value="#{msg.ADMIN_SHOW_USER_HEADER}">
                                <f:param value="#{beanHelper.user.userName}" />
                                <f:param value="#{beanHelper.user.userId}" />
                        </h:outputFormat>
                </f:facet>
 
-               <h:column>
-                       <h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
+               <p:column>
+                       <p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.DATA_USER_ID}" />
 
-                       <h:outputText id="userId" styleClass="table_data_field" value="#{beanHelper.user.userId}" />
-               </h:column>
+                       <h:outputText id="userId" styleClass="table-data-field" value="#{beanHelper.user.userId}" />
+               </p:column>
 
-               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-                       <h:column>
-                               <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+                       <p:column>
+                               <p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.DATA_USER_NAME}" />
 
-                               <h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
-                       </h:column>
+                               <h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
+                       </p:column>
                </ui:fragment>
 
-               <h:column>
-                       <h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
+               <p:column>
+                       <p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
-                       <h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
-                               <f:convertDateTime for="userCreated" type="both" />
+                       <h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
-                       <h:outputLabel for="userUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_UPDATED}" />
+               <p:column>
+                       <p:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
 
-                       <h:outputText id="userUpdated" styleClass="table_data_field" value="#{beanHelper.user.userUpdated.time}">
-                               <f:convertDateTime for="userUpdated" type="both" />
+                       <h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
-                       <h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+               <p:column>
+                       <p:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
-                       <h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
-               </h:column>
+                       <h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
+               </p:column>
 
-               <h:column>
-                       <h:outputLabel for="userProfileMode" styleClass="table_data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+               <p:column>
+                       <p:outputLabel for="userProfileMode" styleClass="table-data-label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
 
-                       <h:outputText id="userProfileMode" styleClass="table_data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
-               </h:column>
+                       <h:outputText id="userProfileMode" styleClass="table-data-field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
+               </p:column>
 
-               <h:column>
-                       <h:outputLabel for="userLastLocked" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+               <p:column>
+                       <p:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.DATA_USER_LAST_LOCKED}" />
 
-                       <h:outputText id="userLastLocked" styleClass="table_data_field" value="#{beanHelper.user.userLastLocked.time}">
-                               <f:convertDateTime for="userLastLocked" type="both" />
+                       <h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
-                       <h:outputLabel for="userLastLockedReason" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+               <p:column>
+                       <p:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.DATA_USER_LAST_LOCKED_REASON}" />
 
-                       <h:outputText id="userLastLockedReason" styleClass="table_data_field" value="#{beanHelper.user.userLastLockedReason}" />
-               </h:column>
+                       <h:outputText id="userLastLockedReason" styleClass="table-data-field" value="#{beanHelper.user.userLastLockedReason}" />
+               </p:column>
 
-               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_columns.tpl" />
-       </h:panelGrid>
+               <core:outputContactDataGridColumns />
+       </p:panelGrid>
 </ui:composition>