Please cherry-pick:

[jjobs-war.git] / web / admin / user / admin_user_list.xhtml

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index fdd0c1408d4aa34a0f0417c5fa1471db89adeacb..1f8eb8ff0a112ae870f2e7f3d5834bcd29ffceb0 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -176,7 +176,13 @@
 
                                <!-- ... or enter it directly together it creating user account //-->
                                <h:panelGroup layout="block">
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+                                       <core:outputAdminUserDataFormFields mode="add" />
+
+                                       <h:panelGroup styleClass="para notice">
+                                               <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
+                                       </h:panelGroup>
+
+                                       <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
                                </h:panelGroup>
 
                                <f:facet name="footer">