Please cherry-pick:

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

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
index 67d67310c865b1e77d0ba3c1f1764b781ac569ed..973b944a4f8a64f7d2d03a73096a8793cee3c677 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <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">
 
-       <div class="para notice">
-               #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
-       </div>
+       <core:outputAdminUserDataFormFields mode="add" />
 
-       <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
+       <h:panelGroup styleClass="para notice">
+               <h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
+       </h:panelGroup>
+
+       <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 </ui:composition>