Please cherry-pick:

[jjobs-war.git] / web / admin / landline / admin_landline_list.xhtml

diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 09b9fd6b0efbd6e1b552d1e150b89354841b2f5c..b68260dee7fb36ae00cb0a2fa331b52324ba5817 100644 (file)
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -1,11 +1,12 @@
 <?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:widgets="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: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_LIST_CONTACT_LAND_LINE_NUMBER}" />
@@ -16,41 +17,53 @@
        </ui:define>
 
        <ui:define name="content">
-               <p:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" emptyMessage="#{msg.ADMIN_LANDLINE_NUMBER_LIST_EMPTY}">
+               <p:dataTable
+                       id="table_list_landline"
+                       var="landLineNumber"
+                       value="#{phoneListController.allLandLineNumbers}"
+                       paginator="true"
+                       rows="10"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}"
+                       emptyMessage="#{msg.ADMIN_EMPTY_LIST_LANDLINE_NUMBER}"
+                       >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+                                       <h:outputText value="#{msg.ID_HEADER}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
-                                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                               <p:link
+                                       outcome="admin_show_landline"
+                                       value="#{landLineNumber.phoneId}"
+                                       title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
+                                       >
+                                       <f:param name="landLineId" value="#{landLineNumber.phoneId}" />
                                </p:link>
                        </p:column>
 
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+                                       <h:outputText value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER}" />
                                </f:facet>
 
-                               <h:outputText value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
+                               <h:outputText value="#{beanHelper.renderPhoneNumber(landLineNumber)}" />
                        </p:column>
 
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+                                       <h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
                                </f:facet>
 
-                               <h:outputText value="#{landLineNumber.phoneEntryCreated.time}">
+                               <h:outputText value="#{landLineNumber.phoneEntryCreated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
 
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+                                       <h:outputText value="#{msg.ENTRY_UPDATED_HEADER}" />
                                </f:facet>
 
-                               <h:outputText value="#{landLineNumber.phoneEntryUpdated.time}">
+                               <h:outputText value="#{landLineNumber.phoneEntryUpdated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>