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 29f9364119d358a956610df1093a652715892295..02a58ddbd15aef1a425fd3cd661f428f0e65529d 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -8,14 +8,23 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_USER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_USER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_USER}" />
                </ui:define>
 
                <ui:define name="content">
-                       <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
+                       <ui:fragment rendered="#{userController.allUsers().isEmpty()}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
+                                       <ui:param name="styleClass" value="errors" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
                                <h:column>
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
@@ -26,13 +35,15 @@
                                        </h:link>
                                </h:column>
 
-                               <h:column>
-                                       <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
-                                       </f:facet>
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                                       <h:column>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
+                                               </f:facet>
 
-                                       <h:outputText value="#{user.userName}" />
-                               </h:column>
+                                               <h:outputText value="#{user.userName}" />
+                                       </h:column>
+                               </ui:fragment>
 
                                <h:column>
                                        <f:facet name="header">
@@ -85,14 +96,15 @@
                                </h:column>
                        </h:dataTable>
 
-                       <div class="table_medium">
+                       <h:panelGroup styleClass="table_medium" layout="block">
                                <h:form id="admin_add_user">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
                                        </div>
 
-                                       <div class="para">
-                                               <fieldset id="user_contact">
+                                       <!-- Whether select contact data .. //-->
+                                       <div id="admin_user_personal_data_option_1" class="para">
+                                               <fieldset class="fieldset" id="user_contact">
                                                        <legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
                                                                <h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
                                                        </legend>
@@ -118,14 +130,21 @@
                                                <h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
                                        </div>
 
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+                                       <!-- ... or enter it directly together it creating user account //-->
+                                       <div id="admin_user_personal_data_option_2">
+                                               <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+                                       </div>
+
+                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
+                                               <ui:param name="mode" value="add" />
+                                       </ui:include>
 
                                        <div class="table_footer">
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                <h:commandButton styleClass="submit" type="submit" id="add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
                                        </div>
                                </h:form>
-                       </div>
+                       </h:panelGroup>
                </ui:define>
        </ui:composition>
 </html>