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 15ce96640b363958847c6216f6466f81f05011c7..9eb72bd3cff854172765616106c550adc9106370 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -134,24 +134,35 @@
                                </p:column>
 
                                <p:column
-                                       headerText="#{msg.ADMIN_CONTACT_USAGE}"
-                                       sortable="false"
-                                       filterable="false"
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{contact.contactCreated}"
+                                       filterBy="#{contact.contactCreated}"
+                                       filterMatchMode="contains"
                                        >
-                                       <h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
+                                       <h:outputText value="#{contact.contactCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
                                </p:column>
 
                                <p:column
-                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
-                                       sortBy="#{contact.contactCreated}"
-                                       filterBy="#{contact.contactCreated}"
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{contact.contactUpdated}"
+                                       filterBy="#{contact.contactUpdated}"
                                        filterMatchMode="contains"
                                        >
-                                       <h:outputText id="contactCreated" value="#{contact.contactCreated}">
+                                       <h:outputText value="#{contact.contactUpdated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_USAGE}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
+                               </p:column>
+
                                <p:column
                                        headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
                                        sortable="false"
@@ -177,7 +188,9 @@
                                        <p:panelGrid columns="2" rendered="#{not empty contactListController.selectedContact}">
                                                <f:facet name="header">
                                                        <h:outputFormat value="#{msg.ADMIN_CONTACT_DETAILS_HEADER}">
-                                                               <f:param value="#{contactListController.selectedContact.companyName}" />
+                                                               <f:param value="#{msg[contactListController.selectedContact.contactPersonalTitle.messageKey]}" />
+                                                               <f:param value="#{contactListController.selectedContact.contactFirstName}" />
+                                                               <f:param value="#{contactListController.selectedContact.contactFamilyName}" />
                                                                <f:param value="#{contactListController.selectedContact.contactId}" />
                                                        </h:outputFormat>
                                                </f:facet>
@@ -203,17 +216,19 @@
                                <core:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 
                                <f:facet name="footer">
-                                       <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=":master:form-list-contacts:contactList"
-                                               />
+                                       <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=":master:form-list-contacts:contactList"
+                                                       />
+                                       </p:panelGrid>
                                </f:facet>
                        </p:panelGrid>
                </h:form>