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 d847771b25fbbc3b9c2ce39980423bafc512c18f..9748ffefac2d0851df7dc64c32b9d0d3cf78dd8b 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,6 +1,7 @@
 <?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:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
@@ -17,13 +18,13 @@
                        <h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
 
                        <h:panelGroup styleClass="table_data_field" layout="block">
-                               <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+                               <h:link id="userId" outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
                                        <f:param name="userId" value="#{beanHelper.user.userId}" />
                                </h:link>
                        </h:panelGroup>
                </h:column>
 
-               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:column>
                                <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
 
@@ -45,6 +46,6 @@
                        <h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
                </h:column>
 
-               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_columns_mini.tpl" />
+               <widgets:outputContactDataGridColumns />
        </h:panelGrid>
 </ui:composition>