X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Fadmin%2Fcontact%2Fadmin_contact_list.xhtml;h=5f2cae8cd81b25af20a9cc242e6afa8dd0e59f70;hb=3a65d0cd6c072bb3b1d653829c17be8df3b6de4f;hp=a139d35f9eff32242abf2ae3766991c918e0f9d1;hpb=acbbcfc107b8963fdfe4c9e9d5308c29b3c4bca7;p=pizzaservice-war.git

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index a139d35f..5f2cae8c 100644
--- 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}"
@@ -9,48 +8,69 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT}" />
 		</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()}">
+			<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>
-					<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}">
+					<h: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>
 
 				<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.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" />
@@ -58,10 +78,10 @@
 				</h:column>
 			</h:dataTable>
 
-			<div class="table_medium">
-				<h:form id="admin_add_contact">
+			<h:form id="form_admin_add_contact">
+				<h:panelGroup styleClass="table_medium" layout="block">
 					<div class="table_header">
-						#{msg.ADMIN_ADD_CONTACT_TITLE}
+						<h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
 					</div>
 
 					<div class="para">
@@ -71,11 +91,11 @@
 					<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>
+				</h:panelGroup>
+			</h:form>
 		</ui:define>
 	</ui:composition>
 </html>
