Please cherry-pick:

[pizzaservice-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 03d8c0e1fa6b9553cd4830418c89c64510ed8e69..405d97d550739286a7375a388e43e0212f0489bf 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -1,9 +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: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:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
 
        <ui:define name="admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
@@ -14,70 +17,71 @@
        </ui:define>
 
        <ui:define name="content">
-               <ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
-                               <ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
-                               <ui:param name="styleClass" value="errors" />
-                       </ui:include>
-               </ui:fragment>
-
-               <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
-                       <h:column>
+               <p:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" emptyMessage="#{msg.ADMIN_CONTACT_LIST_EMPTY}">
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
                                </f:facet>
 
-                               <h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+                               <p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
                                        <f:param name="contactId" value="#{contact.contactId}" />
-                               </h:link>
-                       </h:column>
+                               </p:link>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
                                </f:facet>
 
                                <h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
                                </f:facet>
 
                                <h:outputText value="#{contact.contactFirstName}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
                                </f:facet>
 
                                <h:outputText value="#{contact.contactFamilyName}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_CONTACT_USAGE}" />
                                </f:facet>
 
                                <h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
-                       </h:column>
+                       </p:column>
 
-                       <h:column>
+                       <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_CREATED}" />
+                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
                                </f:facet>
 
                                <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
                                        <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
                                </h:outputText>
-                       </h:column>
-               </h:dataTable>
+                       </p:column>
+
+                       <p:column>
+                               <f:facet name="header">
+                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
+                               </f:facet>
+
+                               <links:outputContactAdminMiniLinks contact="#{contact}" />
+                       </p:column>
+               </p:dataTable>
 
                <h:form id="form_admin_add_contact">
-                       <h:panelGroup styleClass="table_medium" layout="block">
-                               <div class="table_header">
+                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
                                </div>
 
@@ -85,13 +89,25 @@
                                        <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
                                </div>
 
-                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
-
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <h:commandButton styleClass="submit" type="submit" id="add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
-                               </div>
-                       </h:panelGroup>
+                               <widgets:outputAdminContactDataFormFields />
+
+                               <f:facet name="footer">
+                                       <p:panelGrid columns="2" layout="grid">
+                                               <p:commandButton
+                                                       styleClass="reset"
+                                                       type="reset"
+                                                       value="#{msg.BUTTON_RESET_FORM}"
+                                                       />
+
+                                               <p:commandButton
+                                                       type="submit"
+                                                       value="#{msg.BUTTON_ADMIN_ADD_CONTACT}"
+                                                       action="#{adminContactController.addContact()}"
+                                                       update="form-list-contacts:contactList"
+                                                       />
+                                       </p:panelGrid>
+                               </f:facet>
+                       </p:panelGrid>
                </h:form>
        </ui:define>
 </ui:composition>