Please cherry-pick:

[jjobs-war.git] / web / admin / contact / admin_contact_export.xhtml
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml

index 8ee9e3bdb12890e1738b3ecd739a33eae27e2974..ae78b819fc60fd5de776ee76cb4c6e5e2544ec8e 100644 (file)
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -10,15 +9,17 @@
         xmlns:p="http://primefaces.org/ui">
  
         <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
+               </ui:define>
  
                 <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}" />
                 </ui:define>
  
                 <ui:define name="content">
                         <h:form id="form_export_contacts">
-                               <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_big" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}" rendered="#{contactController.hasContacts()}">
+                               <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
                                         <p:column exportable="false">
                                                 <f:facet name="header">
                                                         <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
@@ -74,7 +75,7 @@
                                                         <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_HOUSE_NUMBER}" />
                                                 </f:facet>
  
-                                               <h:outputText value="#{contact.contactHouseNumber}" />
+                                               <h:outputText value="#{contact.contactHouseNumber}#{contact.contactHouseNumberExtension}" />
                                         </p:column>
  
                                         <p:column>
@@ -121,10 +122,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(contact.contactCellphoneNumber)}" />
+                                               <h:outputText value="#{adminContactController.generateMobileNumber(contact.contactMobileNumber)}" />
                                         </p:column>
  
                                         <p:column>
@@ -154,7 +155,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_CONTACTS_TITLE}" />
                                         </div>
@@ -168,7 +169,7 @@
                                                         <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
                                                 </h:commandButton>
                                         </div>
-                               </div>
+                               </h:panelGroup>
                         </h:form>
                 </ui:define>
         </ui:composition>