From: Roland Häder <roland@mxchange.org>
Date: Mon, 11 Jul 2016 16:03:32 +0000 (+0200)
Subject: Closed internal TODO: (please cherry-pick this)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1867e6b3fb48c2748da3886ab1d576a0dab0bb49;p=addressbook-war.git

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 38bf4f57..44997450 100644
--- 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 9721d859..47f5d316 100644
--- 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 6b1be220..0eacc4ac 100644
--- 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 7184ad53..607954b6 100644
--- 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}" />