Please cherry-pick:

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

diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
index d0564cfbaa0ebb3002d15adf3294a3c6478b6e85..f4e7041474c429baf72380fb1c04eda015d5afdc 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       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"
        xmlns:p="http://primefaces.org/ui">
 
-       <p:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
+       <!--
+       @TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
+       -->
+       <p:panelGrid styleClass="table table-full" columns="2" rendered="#{not empty beanHelper.user}">
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
                                <f:param value="#{beanHelper.user.userName}" />
@@ -15,7 +18,7 @@
                        </h:outputFormat>
                </f:facet>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
@@ -23,30 +26,30 @@
                                        <f:param name="userId" value="#{beanHelper.user.userId}" />
                                </p:link>
                        </h:panelGroup>
-               </h:column>
+               </p:column>
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                       <h:column>
+                       <p:column>
                                <p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
 
                                <h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
-                       </h:column>
+                       </p:column>
                </ui:fragment>
 
-               <h:column>
+               <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>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <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>
+               </p:column>
 
-               <widgets:outputContactDataGridColumns />
+               <core:outputContactDataGridColumns />
        </p:panelGrid>
 </ui:composition>