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 dbd24a44ee2917f108a88bc1b8be35fd90e100f1..a673634bcbb07c2057bfe01c99f85ab44da2009d 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -1,11 +1,13 @@
 <?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:core="http://mxchange.org/jsf/core/widgets"
-                               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"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       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:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
@@ -16,12 +18,11 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:form id="form_export_users">
+               <h:form id="form-export-users">
                        <p:dataTable
-                               id="table_export_users"
+                               id="table-export-users"
                                var="user"
                                value="#{userController.allUsers()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                rows="10"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}"
@@ -141,7 +142,7 @@
                                        </f:facet>
 
                                        <h:outputText id="contactBirthday" value="#{user.userContact.contactBirthday}">
-                                               <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+                                               <f:convertDateTime type="date" dateStyle="medium" />
                                        </h:outputText>
                                </p:column>
 
@@ -174,13 +175,13 @@
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
                                        </f:facet>
 
-                                       <h:outputText id="contactCreated" value="#{user.userContact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+                                       <h:outputText id="contactCreated" value="#{user.userContact.contactCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
                                        </h:outputText>
                                </p:column>
                        </p:dataTable>
 
-                       <h:panelGroup styleClass="table table-full" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
                                </div>
@@ -189,11 +190,18 @@
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="submit" type="submit" id="submit_export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
-                                               <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
-                                       </p:commandButton>
-                               </div>
+                               <p:commandButton
+                                       ajax="false"
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}"
+                                       >
+
+                                       <p:dataExporter
+                                               type="xls"
+                                               target="table-export-users"
+                                               fileName="all_users"
+                                               />
+                               </p:commandButton>
                        </h:panelGroup>
                </h:form>
        </ui:define>