Closed internal TODO: (please cherry-pick this)

[pizzaservice-war.git] / web / WEB-INF / templates / admin / contact / admin_contact_data.tpl

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl
index 997d8272156587970450d0f8c1885a16707d154a..0cf4cfd1eb31ba8e7f4065c23cbaa0fec38429bb 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_data.tpl
@@ -5,101 +5,107 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty adminHelper.contact}">
+       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.contact}">
                <f:facet name="header">
                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
-                               <f:param value="#{adminHelper.contact.contactId}" />
+                               <f:param value="#{beanHelper.contact.contactId}" />
                        </h:outputFormat>
                </f:facet>
 
                <h:column>
-                       <h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+                       <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                       <h:outputText id="userId" styleClass="data_field" value="#{adminHelper.contact.contactId}" />
+                       <h:outputText id="contactId" styleClass="data_field" value="#{beanHelper.contact.contactId}" />
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
+                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
 
-                       <h:outputText id="userCreated" styleClass="data_field" value="#{adminHelper.contact.contactCreated.time}">
-                               <f:convertDateTime for="userCreated" type="both" />
+                       <h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.contact.contactCreated.time}">
+                               <f:convertDateTime for="contactCreated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column>
-                       <h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
+                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
 
-                       <h:outputText id="userUpdated" styleClass="data_field" value="#{adminHelper.contact.contactUpdated.time}">
-                               <f:convertDateTime for="userUpdated" type="both" />
+                       <h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.contact.contactUpdated.time}">
+                               <f:convertDateTime for="contactUpdated" type="both" />
                        </h:outputText>
                </h:column>
 
                <h:column>
                        <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
 
-                       <h:outputText id="isOwnContact" styleClass="data_field" value="#{adminHelper.contact.isOwnContact()}" />
+                       <h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.contact.isOwnContact()}" />
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
 
-                       <h:outputText id="contactGender" styleClass="data_field" value="#{msg[adminHelper.contact.contactGender.messageKey]}" />
+                       <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
 
-                       <h:outputText id="contactTitle" styleClass="data_field" value="#{adminHelper.contact.contactTitle}" />
+                       <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.contact.contactTitle}" />
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-                       <h:outputText id="contactFirstName" styleClass="data_field" value="#{adminHelper.contact.contactFirstName}" />
+                       <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.contact.contactFirstName}" />
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-                       <h:outputText id="contactFamilyName" styleClass="data_field" value="#{adminHelper.contact.contactFamilyName}" />
+                       <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.contact.contactFamilyName}" />
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
 
-                       <h:outputText id="contactStreet" styleClass="data_field" value="#{adminHelper.contact.contactStreet}" />
+                       <h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.contact.contactStreet}" />
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
 
-                       <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{adminHelper.contact.contactHouseNumber}" />
+                       <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumber}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactHouseNumberExtension" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+
+                       <h:outputText id="contactHouseNumberExtension" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
 
-                       <h:outputText id="contactZipCode" styleClass="data_field" value="#{adminHelper.contact.contactZipCode}" />
+                       <h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.contact.contactZipCode}" />
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
 
-                       <h:outputText id="contactCity" styleClass="data_field" value="#{adminHelper.contact.contactCity}" />
+                       <h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.contact.contactCity}" />
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-                       <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{adminHelper.contact.contactEmailAddress}">
-                               <h:outputText value="#{adminHelper.contact.contactEmailAddress}" />
+                       <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+                               <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
                        </h:outputLink>
                </h:column>
 
                <h:column>
                        <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
-                       <h:outputText id="contactBirthday" styleClass="data_field" value="#{adminHelper.contact.contactBirthday.time}">
+                       <h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.contact.contactBirthday.time}">
                                <f:convertDateTime for="contactBirthday" type="date" />
                        </h:outputText>
                </h:column>