again some more h:outputText for better encapsulation of messages. and it makes more...

[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 4da2efb2442143a0af90b34dba48a666b9419407..af2c2af18dc726302e00762901b37bd16ac0bca1 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -16,9 +16,11 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:dataTable id="table_list_contacts" var="contact" value="#{adminContactController.allContacts()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{adminContactController.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="#{contactController.hasContacts()}">
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_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 +28,41 @@
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_LIST_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_LIST_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_LIST_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.getUserCustomerUsageMessageKey(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" />
@@ -61,14 +73,18 @@
                        <div class="table_medium">
                                <h:form id="admin_add_contact">
                                        <div class="table_header">
-                                               #{msg.ADMIN_ADD_CONTACT_TITLE}
+                                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
+                                       </div>
+
+                                       <div class="para">
+                                               <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 class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
+                                               <h:commandButton styleClass="reset" 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>