Please cherry-pick:

[jjobs-war.git] / web / admin / contact / admin_contact_list.xhtml

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 23a8c17d7d6d3e4de6b5495ba4f6b2570f726f60..d50617083314a30c9638f9c336facaebb72b58ac 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -1,12 +1,14 @@
 <?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:links="http://mxchange.org/jsf/core/links"
-                               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:links="http://mxchange.org/jsf/core/links"
+       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}" />
@@ -19,10 +21,9 @@
        <ui:define name="content">
                <h:form id="form-list-contacts">
                        <p:dataTable
-                               id="table-list-contacts"
+                               id="contactList"
                                var="contact"
                                value="#{contactController.allContacts()}"
-                               tableStyleClass="table table-full"
                                paginator="true"
                                rows="10"
                                summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}"
@@ -73,17 +74,17 @@
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_HEADER_ENTRY_CREATED}" />
+                                               <h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
                                        </f:facet>
 
-                                       <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
+                                       <h:outputText id="contactCreated" value="#{contact.contactCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_HEADER_ACTION_LINKS}" />
+                                               <h:outputText value="#{msg.ADMIN_ACTION_LINKS_HEADER}" />
                                        </f:facet>
 
                                        <links:outputContactAdminMiniLinks contact="#{contact}" />
@@ -92,7 +93,10 @@
                </h:form>
 
                <h:form>
-                       <p:panelGrid layout="grid" columns="1" styleClass="table table-full">
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
                                </f:facet>
@@ -108,11 +112,11 @@
                                                value="#{msg.BUTTON_RESET_FORM}"
                                                />
                                        <p:commandButton
-                                               styleClass="submit"
+                                               process="@form"
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_ADD_CONTACT}"
                                                action="#{adminContactController.addContact()}"
-                                               update=":master:form-list-contacts:table-list-contacts"
+                                               update=":master:form-list-contacts:contactList"
                                                />
                                </f:facet>
                        </p:panelGrid>