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 54f122a883ccb7e2071af82a0ef2f1bc974fb3f6..68f37a2fef708d6bd677f7edf81cd3381c61fba4 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -19,7 +19,7 @@
        <ui:define name="content">
                <h:form id="form-list-users">
                        <p:dataTable
-                               id="table-list-users"
+                               id="userList"
                                var="user"
                                value="#{userController.allUsers()}"
                                tableStyleClass="table table-full"
@@ -41,7 +41,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_USERS_HEADER}" />
 
                                                <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                               <p:columnToggler datasource="table-list-users" trigger="toggler" />
+                                               <p:columnToggler datasource="userList" trigger="toggler" />
                                        </p:panelGrid>
                                </f:facet>
 
@@ -132,13 +132,13 @@
                                        <h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_LIST_ENTRY_CREATED}" sortBy="#{user.userCreated}" filterable="false">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{user.userCreated}" filterable="false">
                                        <h:outputText id="userCreated" value="#{user.userCreated.time}">
                                                <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS}" sortable="false" filterable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false" filterable="false">
                                        <links:outputUserAdminMiniLinks user="#{user}" />
                                </p:column>
                        </p:dataTable>
@@ -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">
@@ -189,7 +195,7 @@
                                                        id="submit_add_user"
                                                        value="#{msg.BUTTON_ADMIN_ADD_USER}"
                                                        action="#{adminUserController.addUser()}"
-                                                       update=":master:form-list-users:table-list-users"
+                                                       update=":master:form-list-users:userList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>