opps, not all was renamed (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 19327c8fcf584f92229af72a52ed5287173d15e0..d81c1ce02bb90a1f7dd6df1dea4f896f088bd0e1 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -15,7 +15,7 @@
                </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="#{userController.hasUsers()}">
+                       <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()}">
                                <h:column>
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
@@ -85,14 +85,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>
@@ -105,7 +106,7 @@
                                                                <div class="table_right_medium">
                                                                        <h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
                                                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                                                               <f:selectItems value="#{userController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+                                                                               <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
                                                                        </h:selectOneMenu>
                                                                </div>
 
@@ -118,14 +119,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>