Updated copyright year

[addressbook-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 79731fec36003225af4d6ac78a281e0c5b578e4f..60ede6cf975fa3cbfa1072a3eb8352c65608b183 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -1,12 +1,15 @@
 <?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: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="admin_title">
+<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}" />
        </ui:define>
 
@@ -15,23 +18,28 @@
        </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:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
-                       <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}">
+               <h:form id="form-export-users">
+                       <p:dataTable
+                               id="table-export-users"
+                               var="user"
+                               value="#{userListController.allUsers}"
+                               paginator="true"
+                               rows="10"
+                               summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}"
+                               emptyMessage="#{msg.ADMIN_EMPTY_LIST_USER}"
+                               >
                                <p:column exportable="false">
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
                                        </f:facet>
 
-                                       <h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+                                       <p:link
+                                               outcome="admin_show_user"
+                                               value="#{user.userId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                               >
                                                <f:param name="userId" value="#{user.userId}" />
-                                       </h:link>
+                                       </p:link>
                                </p:column>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
@@ -138,7 +146,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>
 
@@ -152,10 +160,10 @@
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{adminContactController.generateLandLineNumber(user.userContact.contactLandLineNumber)}" />
+                                       <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactLandLineNumber)}" />
                                </p:column>
 
                                <p:column>
@@ -163,7 +171,7 @@
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_FAX_NUMBER}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{adminContactController.generateLandLineNumber(user.userContact.contactFaxNumber)}" />
+                                       <h:outputText value="#{adminContactController.generatePhoneNumber(user.userContact.contactFaxNumber)}" />
                                </p:column>
 
                                <p:column>
@@ -171,14 +179,34 @@
                                                <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 value="#{user.userContact.contactEntryCreated}">
+                                               <f:convertDateTime
+                                                       type="both"
+                                                       timeStyle="short"
+                                                       dateStyle="short"
+                                                       locale="#{localizationController.locale}"
+                                                       />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_UPDATED}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{user.userContact.contactEntryUpdated}">
+                                               <f:convertDateTime
+                                                       type="both"
+                                                       timeStyle="short"
+                                                       dateStyle="short"
+                                                       locale="#{localizationController.locale}"
+                                                       />
                                        </h:outputText>
                                </p:column>
                        </p:dataTable>
 
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
                                </div>
 
@@ -186,11 +214,18 @@
                                        <h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="submit" type="submit" id="export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
-                                               <p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
-                                       </h: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>