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 43f73d7637ef23551b43dbb894802ad2ee407dd2..d3c5660c78de67630d114a67bfaf9b0f036a3f9e 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
                                xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+                               xmlns:links="http://mxchange.org/jsf/core/links"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
                                xmlns:f="http://xmlns.jcp.org/jsf/core">
@@ -14,14 +16,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <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()}">
+               <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
+
+               <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_USER_ID}" />
@@ -84,57 +81,63 @@
 
                        <h:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_USER_CREATED}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
                                </f:facet>
 
                                <h:outputText id="userCreated" value="#{user.userCreated.time}">
                                        <f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
                                </h:outputText>
                        </h:column>
+
+                       <h:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
+                               </f:facet>
+
+                               <links:outputUserAdminMiniLinks user="#{user}" />
+                       </h:column>
                </h:dataTable>
 
-               <h:panelGroup styleClass="table_medium" layout="block">
+               <h:panelGroup styleClass="table table-medium" layout="block">
                        <h:form id="form_admin_add_user">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
                                </div>
 
                                <!-- Whether select contact data .. //-->
-                               <div id="admin_user_personal_data_option_1" class="para">
+                               <h:panelGroup id="admin_user_personal_data_option_1" styleClass="para" layout="block">
                                        <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>
 
-                                               <h:panelGroup styleClass="table_row" layout="block">
-                                                       <div class="table_left_medium">
+                                               <h:panelGroup styleClass="table-row" layout="block">
+                                                       <div class="table-left-medium">
                                                                <h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
                                                        </div>
 
-                                                       <div class="table_right_medium">
-                                                               <h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
-                                                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                                       <div class="table-right-medium">
+                                                               <h:selectOneMenu styleClass="select" id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
+                                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                                        <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
                                                                </h:selectOneMenu>
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
                                        </fieldset>
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="para">
+                               <h:panelGroup styleClass="para" layout="block">
                                        <h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
-                               </div>
+                               </h:panelGroup>
 
                                <!-- ... or enter it directly together it creating user account //-->
-                               <div id="admin_user_personal_data_option_2">
+                               <h:panelGroup id="admin_user_personal_data_option_2" layout="block">
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
-                               </div>
+                               </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <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 class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" id="button_add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
                                </div>
                        </h:form>
                </h:panelGroup>