Please cherry-pick:

[jjobs-war.git] / web / admin / user / admin_user_export.xhtml

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 1063e00233fa494de456517e4fb63ed3e434392b..65bb4c671cc65ab8ad14f1d4a658a7f7da3daea3 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -5,7 +5,6 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-
        xmlns:p="http://primefaces.org/ui">
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -17,7 +16,7 @@
 
                <ui:define name="content">
                        <h:form id="form_export_users">
-                               <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_big" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}" rendered="#{userController.hasUsers()}">
+                               <p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}" rendered="#{not userController.allUsers().isEmpty()}">
                                        <p:column exportable="false">
                                                <f:facet name="header">
                                                        <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
@@ -138,10 +137,10 @@
 
                                        <p:column>
                                                <f:facet name="header">
-                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CELLPHONE_NUMBER}" />
+                                                       <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_MOBILE_NUMBER}" />
                                                </f:facet>
 
-                                               <h:outputText value="#{adminContactController.generateCellphoneNumber(user.userContact.contactCellphoneNumber)}" />
+                                               <h:outputText value="#{adminContactController.generateMobileNumber(user.userContact.contactMobileNumber)}" />
                                        </p:column>
 
                                        <p:column>
@@ -171,7 +170,7 @@
                                        </p:column>
                                </p:dataTable>
 
-                               <div class="table_medium">
+                               <h:panelGroup styleClass="table_medium" layout="block">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
                                        </div>
@@ -185,7 +184,7 @@
                                                        <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
                                                </h:commandButton>
                                        </div>
-                               </div>
+                               </h:panelGroup>
                        </h:form>
                </ui:define>
        </ui:composition>