Closed internal TODO: (please cherry-pick this)

- house numbers may have extensions like 'a', so the full number can be
  e.g. '123a' which should be better splitted into number and extension
- expanded templates for above stuff
- expanded controllers for this
- added missing i18n strings

Signed-off-by: Roland Häder <roland@haeder.net>
Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 10b0da521a7f1979f55b49661fd84830499fff7f..84e8f1f94a3c9b475057ce9554805fc880dfea67 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -567,3 +567,18 @@ GUEST_USER_RESEND_LINK_COMPLETED=Es ist ein neuer Best\u00e4tigungslink an Ihre
 GUEST_USER_NO_ACCOUNT_YET_QUESTION=Noch kein Benutzerkonto?
 LINK_GUEST_USER_NO_ACCOUNT_YET_TITLE=Als Benutzer anmelden
 LINK_GUEST_USER_NO_ACCOUNT_YET=Einfach hier anmelden.
+ERROR_GUEST_REGISTRATION_DISABLED=Fehler: Die Anmeldung ist administrativ deaktiviert worden.
+ERROR_LOGIN_USER_EDIT_DATA_DISABLED=Fehler: Editieren von Benutzerdaten wurde administrativ deaktiviert.
+PAGE_TITLE_USER_LOGIN_REPORTS=Berichte
+SUB_TITLE_USER_LOGIN_REPORTS=Berichte:
+LINK_USER_LOGOUT=Ausloggen
+LINK_USER_LOGOUT_TITLE=Aus dem Mitgliedsbereich ausloggen.
+ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED=Fehler: Erneutes Aussenden des Best\u00e4tigungslink wurde administrativ deaktiviert.
+PAGE_TITLE_LOGIN_USER_LOGOUT=Ausloggen aus dem Benutzerbereich
+CONTENT_TITLE_LOGIN_USER_LOGOUT=Aus dem Benutzerbereich ausloggen:
+LOGIN_USER_LOGOUT_TITLE=Aus Benutzerbereich ausloggen?
+LOGIN_USER_LOGOUT_NOTICE=M\u00f6chten Sie sich aus dem Benutzerbereich ausloggen? Dies sollten Sie immer an einem Rechner tun, den auch andere nutzen (z.B. Internetcafe).
+BUTTON_USER_LOGOUT=Ausloggen
+ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung:
+ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung:
+PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Anhang:

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 6f8c24221ea8e711c188021306e7805dacc06979..ad51b94f14139178636cfcb2934993a9b1b4b077 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -551,3 +551,16 @@ GUEST_USER_RESEND_LINK_COMPLETED=A new confirmation link has been sent out to yo
 GUEST_USER_NO_ACCOUNT_YET_QUESTION=Not yet registered as user?
 LINK_GUEST_USER_NO_ACCOUNT_YET_TITLE=Register as a user
 LINK_GUEST_USER_NO_ACCOUNT_YET=Signup here quickly.
+ERROR_GUEST_REGISTRATION_DISABLED=Error: Registration has been administratively deactivated.
+ERROR_LOGIN_USER_EDIT_DATA_DISABLED=Error: Editing of user data has been disabled by administrators.
+LINK_USER_LOGOUT=Logout
+LINK_USER_LOGOUT_TITLE=Logout from user area.
+ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED=Error: Sending out confirmation link has been deactivated.
+PAGE_TITLE_LOGIN_USER_LOGOUT=Logout from user area
+CONTENT_TITLE_LOGIN_USER_LOGOUT=Logout from user area:
+LOGIN_USER_LOGOUT_TITLE=Logout from user area?
+LOGIN_USER_LOGOUT_NOTICE=Do you want to logout from user area? You should always do this when you share the same computer with others (e.g. Internet cafe).
+BUTTON_USER_LOGOUT=Logout
+ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION=House number extension:
+ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=House number extension:
+PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Extension:

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
index 94487af0287326b34d95c2a6d7e2f0dac975638c..8d1552c4a902747b82624b259ee763cd6f4c89c1 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
@@ -174,6 +174,11 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
         */
        private Short houseNumber;
 
+       /**
+        * House number extension
+        */
+       private String houseNumberExtension;
+
        /**
         * Whether a cellphone entry has been unlinked
         */
@@ -691,6 +696,16 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                this.houseNumber = houseNumber;
        }
 
+       @Override
+       public String getHouseNumberExtension () {
+               return this.houseNumberExtension;
+       }
+
+       @Override
+       public void setHouseNumberExtension (final String houseNumberExtension) {
+               this.houseNumberExtension = houseNumberExtension;
+       }
+
        @Override
        public Long getLandLineId () {
                return this.landLineId;
@@ -774,7 +789,6 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
        private void clear () {
                // Clear all data
                // - personal data
-               this.setGender(Gender.UNKNOWN);
                this.setTitle(null);
                this.setFirstName(null);
                this.setFamilyName(null);
@@ -856,6 +870,7 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaController impleme
                contact.setContactFamilyName(this.getFamilyName());
                contact.setContactStreet(this.getStreet());
                contact.setContactHouseNumber(this.getHouseNumber());
+               contact.setContactHouseNumberExtension(this.getHouseNumberExtension());
                contact.setContactZipCode(this.getZipCode());
                contact.setContactCity(this.getCity());
                contact.setContactCountry(this.getCountry());

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
index c1fa9668aae459bed321a5c51319edec5603004e..d05e34cd0f2709f1eb1a39ff25aef2612aa8da5e 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
@@ -313,6 +313,21 @@ public interface PizzaAdminContactWebRequestController extends Serializable {
         */
        void setHouseNumber (final Short houseNumber);
 
+       /**
+        * Getter for house number extension, example: 123a 'a' is then the
+        * extension and 123 is the house number.
+        * <p>
+        * @return House number extension
+        */
+       String getHouseNumberExtension ();
+
+       /**
+        * Setter for house number extension
+        * <p>
+        * @param houseNumberExtension House number extension
+        */
+       void setHouseNumberExtension (final String houseNumberExtension);
+
        /**
         * Getter for phone number's area code
         * <p>
@@ -397,6 +412,23 @@ public interface PizzaAdminContactWebRequestController extends Serializable {
         */
        void setZipCode (final Integer zipCode);
 
+       /**
+        * Getter for controller type
+        * <p>
+        * @return controller type
+        */
+       String getControllerType ();
+
+       /**
+        * Setter for controller type
+        * <p>
+        * @param controllerType Controller type
+        * <p>
+        * @deprecated Don't use this method
+        */
+       @Deprecated
+       void setControllerType (final String controllerType);
+
        /**
         * Returns a text respresentation of given phone number or null if not set.
         * <p>

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
index 07400a0c24268584cda8f2f35c78fb9cc935f206..5d6be6d9dae0d90fcdf92be6c107a2e0635c1ba7 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
@@ -160,6 +160,11 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
         */
        private Short houseNumber;
 
+       /**
+        * House number extension
+        */
+       private String houseNumberExtension;
+
        /**
         * Whether a cellphone entry has been unlinked
         */
@@ -482,6 +487,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName());
                contact.setContactStreet(this.getStreet());
                contact.setContactHouseNumber(this.getHouseNumber());
+               contact.setContactHouseNumberExtension(this.getHouseNumberExtension());
                contact.setContactZipCode(this.getZipCode());
                contact.setContactCity(this.getCity());
                contact.setContactCountry(this.getCountry());
@@ -583,6 +589,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                contact.setContactFamilyName(this.getFamilyName());
                contact.setContactStreet(this.getStreet());
                contact.setContactHouseNumber(this.getHouseNumber());
+               contact.setContactHouseNumberExtension(this.getHouseNumberExtension());
                contact.setContactZipCode(this.getZipCode());
                contact.setContactCity(this.getCity());
                contact.setContactCountry(this.getCountry());
@@ -755,6 +762,16 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                this.houseNumber = houseNumber;
        }
 
+       @Override
+       public String getHouseNumberExtension () {
+               return this.houseNumberExtension;
+       }
+
+       @Override
+       public void setHouseNumberExtension (final String houseNumberExtension) {
+               this.houseNumberExtension = houseNumberExtension;
+       }
+
        @Override
        public Integer getPhoneAreaCode () {
                return this.phoneAreaCode;
@@ -943,11 +960,11 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
        private void clear () {
                // Clear all data
                // - personal data
-               this.setGender(Gender.UNKNOWN);
                this.setFirstName(null);
                this.setFamilyName(null);
                this.setStreet(null);
                this.setHouseNumber(null);
+               this.setHouseNumberExtension(null);
                this.setZipCode(null);
                this.setCity(null);
                this.setCountry(null);
@@ -995,6 +1012,7 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
                this.setFamilyName(contact.getContactFamilyName());
                this.setStreet(contact.getContactStreet());
                this.setHouseNumber(contact.getContactHouseNumber());
+               this.setHouseNumberExtension(contact.getContactHouseNumberExtension());
                this.setZipCode(contact.getContactZipCode());
                this.setCity(contact.getContactCity());
                this.setCountry(contact.getContactCountry());

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
index 6b4f000b8f14703605df03806afb8636d5cb8603..ddb6a55f4e0c2b1ca0f790649fb05c9c1769f263 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
@@ -345,6 +345,21 @@ public interface PizzaContactWebSessionController extends Serializable {
         */
        void setHouseNumber (final Short houseNumber);
 
+       /**
+        * Getter for house number extension, example: 123a 'a' is then the
+        * extension and 123 is the house number.
+        * <p>
+        * @return House number extension
+        */
+       String getHouseNumberExtension ();
+
+       /**
+        * Setter for house number extension
+        * <p>
+        * @param houseNumberExtension House number extension
+        */
+       void setHouseNumberExtension (final String houseNumberExtension);
+
        /**
         * Getter for phone number's area code
         * <p>

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 5e29f6f67cf6e545e9f591a704032f67cb07415e..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
@@ -1,107 +1,113 @@
-<?xml version="1.0" encoding="UTF-8" ?>\r
-<ui:composition\r
-       xmlns="http://www.w3.org/1999/xhtml"\r
-       xmlns:f="http://java.sun.com/jsf/core"\r
-       xmlns:h="http://java.sun.com/jsf/html"\r
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">\r
-\r
-       <h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.contact}">\r
-               <f:facet name="header">\r
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">\r
-                               <f:param value="#{beanHelper.contact.contactId}" />\r
-                       </h:outputFormat>\r
-               </f:facet>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />\r
-\r
-                       <h:outputText id="contactId" styleClass="data_field" value="#{beanHelper.contact.contactId}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />\r
-\r
-                       <h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.contact.contactCreated.time}">\r
-                               <f:convertDateTime for="contactCreated" type="both" />\r
-                       </h:outputText>\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />\r
-\r
-                       <h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.contact.contactUpdated.time}">\r
-                               <f:convertDateTime for="contactUpdated" type="both" />\r
-                       </h:outputText>\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />\r
-\r
-                       <h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.contact.isOwnContact()}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />\r
-\r
-                       <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />\r
-\r
-                       <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.contact.contactTitle}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />\r
-\r
-                       <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.contact.contactFirstName}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />\r
-\r
-                       <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.contact.contactFamilyName}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />\r
-\r
-                       <h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.contact.contactStreet}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />\r
-\r
-                       <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumber}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />\r
-\r
-                       <h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.contact.contactZipCode}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />\r
-\r
-                       <h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.contact.contactCity}" />\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />\r
-\r
-                       <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">\r
-                               <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />\r
-                       </h:outputLink>\r
-               </h:column>\r
-\r
-               <h:column>\r
-                       <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />\r
-\r
-                       <h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.contact.contactBirthday.time}">\r
-                               <f:convertDateTime for="contactBirthday" type="date" />\r
-                       </h:outputText>\r
-               </h:column>\r
-       </h:panelGrid>\r
-</ui:composition>\r
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <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="#{beanHelper.contact.contactId}" />
+                       </h:outputFormat>
+               </f:facet>
+
+               <h:column>
+                       <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+
+                       <h:outputText id="contactId" styleClass="data_field" value="#{beanHelper.contact.contactId}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
+
+                       <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="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
+
+                       <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="#{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[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="#{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="#{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="#{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="#{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="#{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="#{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="#{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:#{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="#{beanHelper.contact.contactBirthday.time}">
+                               <f:convertDateTime for="contactBirthday" type="date" />
+                       </h:outputText>
+               </h:column>
+       </h:panelGrid>
+</ui:composition>

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index f7f3228b75f1506d1ce75419d0126dd5d750351f..d40c129943451218cd1db6e8a81ed0e2c2402e32 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -99,6 +99,20 @@
 
                        <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
 
+                       <div class="table_row">
+                               <div class="table_left_medium">
+                                       <h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+                               </div>
+
+                               <div class="table_right_medium">
+                                       <h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
                        <div class="table_row">
                                <div class="table_left_medium">
                                        <h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index 91ad63d87cf80661a1c85c88b8309cc3037f06a6..85af850c9958b422261603d7a8d36e1ce5c3898d 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -96,6 +96,20 @@
 
                        <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
 
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <h:inputText styleClass="input" id="houseNumber" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+
                        <div class="table_row">
                                <div class="table_left">
                                        <h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />