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 fda0cf0937041d97bd71cc2bb30d4761c00fa03e..f08378c93f0ed608cdd3ff0fa5944b4cf4882ce2 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -15,9 +15,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{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: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}" />
@@ -89,9 +89,9 @@
                        </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>
 
@@ -102,14 +102,14 @@
                                                        <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">
+                                                       <div class="table-right-medium">
                                                                <h:selectOneMenu styleClass="select" id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
-                                                                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                                                       <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>
@@ -126,8 +126,8 @@
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
                                </h:panelGroup>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                               <div class="table-footer">
+                                       <h:commandButton styleClass="reset divider-right" 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>