Improved many things: (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 988217725e4dc404d179cf8dd532b9b850b288e6..3b03197cf0e56e3a0bf19f7762a777b4fbd9e75e 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.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}"
@@ -16,9 +15,11 @@
                 </ui:define>
  
                 <ui:define name="content">
-                       <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{contactController.hasContacts()}">
+                       <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CONTACT_ID}</f:facet>
+                                       <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_TITLE}" value="#{contact.contactId}">
                                                 <f:param name="contactId" value="#{contact.contactId}" />
@@ -26,31 +27,41 @@
                                 </h:column>
  
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CONTACT_GENDER}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_GENDER}" />
+                                       </f:facet>
  
                                         <h:outputText value="#{msg[contact.contactGender.messageKey]}" />
                                 </h:column>
  
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CONTACT_FIRST_NAME}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                                       </f:facet>
  
                                         <h:outputText value="#{contact.contactFirstName}" />
                                 </h:column>
  
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CONTACT_FAMILY_NAME}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                                       </f:facet>
  
                                         <h:outputText value="#{contact.contactFamilyName}" />
                                 </h:column>
  
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CONTACT_USAGE}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_USAGE}" />
+                                       </f:facet>
  
-                                       <h:outputText value="#{msg[adminHelper.getContactUsageMessageKey(contact)]}" />
+                                       <h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
                                 </h:column>
  
                                 <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CONTACT_CREATED}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_CREATED}" />
+                                       </f:facet>
  
                                         <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
                                                 <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
@@ -59,9 +70,9 @@
                         </h:dataTable>
  
                         <div class="table_medium">
-                               <h:form id="admin_add_contact">
+                               <h:form id="form_admin_add_contact">
                                         <div class="table_header">
-                                               #{msg.ADMIN_ADD_CONTACT_TITLE}
+                                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
                                         </div>
  
                                         <div class="para">
@@ -71,8 +82,8 @@
                                         <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
  
                                         <div class="table_footer">
-                                               <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
+                                               <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:form>
                         </div>