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 38bf4f571f5a1115761145fa4dfbee394c622191..449974508e61f02f8dea19e5106251a1f46ba3d4 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -597,6 +597,11 @@ 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.
+<<<<<<< HEAD
+=======
+PAGE_TITLE_USER_LOGIN_REPORTS=Berichte
+SUB_TITLE_USER_LOGIN_REPORTS=Berichte:
+>>>>>>> 82bcdaf... Closed internal TODO: (please cherry-pick this)
 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.
@@ -608,4 +613,7 @@ BUTTON_USER_LOGOUT=Ausloggen
 ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung:
 ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung:
 PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Anhang:
+<<<<<<< HEAD
 ERROR_PARAMETER_FILE_TYPE_NOT_SET=Fehler: Parameter 'fileType' nicht gesetzt.
+=======
+>>>>>>> 82bcdaf... Closed internal TODO: (please cherry-pick this)

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 9721d859789967a3758835ee19fab464a50df16b..47f5d3168da8fb8a90607c00999dac3af8f80e29 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -606,4 +606,7 @@ 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:
+<<<<<<< HEAD
 ERROR_PARAMETER_FILE_TYPE_NOT_SET=Error: Parameter 'fileType' is not set.
+=======
+>>>>>>> 82bcdaf... Closed internal TODO: (please cherry-pick this)

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 6b1be2208e309e4926d528aa96f036d18dcb9e35..0eacc4ace16f9387b8f9f638866f6a2248f4069c 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
@@ -141,6 +141,20 @@
 
                        <h:message for="houseNumberExtension" 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 7184ad530fbafa049a76f8c4510a2f4e79f2464e..607954b681d8255f8e210de8ae067c5eb1be7608 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -136,6 +136,20 @@
 
                        <h:message for="houseNumberExtension" 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}" />