From 3d1816df421802f9a5dd9fce30ceba7f78365ddc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 29 Mar 2020 23:58:10 +0200 Subject: [PATCH] Please cherry-pick: - rewrote to use DATA_ZIP_CODE only, other *_DATA_ZIP_CODE has been deleted - continued a bit with details p:dialog (modal) box, still need to add all fields, including for administrative list MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- src/java/org/mxchange/localization/generic_de_DE.properties | 4 +--- src/java/org/mxchange/localization/generic_en_US.properties | 4 +--- .../tags/admin/columns/admin_contact_data_columns.tpl | 4 ++-- .../tags/admin/form_data/contact/admin_form_contact_data.tpl | 2 +- .../admin/branch_office/admin_form_branch_office_data.tpl | 2 +- .../templates/admin/headquarter/admin_form_headquarter.tpl | 2 +- web/admin/branch_office/admin_branch_office_list.xhtml | 2 +- web/admin/contact/admin_contact_list.xhtml | 4 +++- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties index 1b905f24..dbc4924e 100644 --- a/src/java/org/mxchange/localization/generic_de_DE.properties +++ b/src/java/org/mxchange/localization/generic_de_DE.properties @@ -259,7 +259,6 @@ ADMIN_PERSONAL_DATA_FIRST_NAME=Vorname: ADMIN_PERSONAL_DATA_FAMILY_NAME=Familienname: ADMIN_DATA_STREET_NAME=Strassenname: ADMIN_DATA_HOUSE_NUMBER=Hausnummer: -ADMIN_DATA_ZIP_CODE=Postleitzahl: ADMIN_DATA_CITY=Wohnort: ADMIN_SELECT_COUNTRY=Land ausw\u00e4hlen: ADMIN_PERSONAL_DATA_PHONE_NUMBER=Telefonnummer: @@ -365,7 +364,6 @@ ADMIN_CONTACT_FIRST_NAME=Vorname: ADMIN_CONTACT_FAMILY_NAME=Nachname: ADMIN_CONTACT_STREET=Strasse: ADMIN_CONTACT_HOUSE_NUMBER=Hausnummer: -ADMIN_CONTACT_ZIP_CODE=Postleitzahl: ADMIN_CONTACT_CITY=Stadt: DATA_EMAIL_ADDRESS=Email-Adresse: ADMIN_CONTACT_BIRTHDAY=Geburtstag: @@ -1194,7 +1192,6 @@ HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE=Hausnummerzusatz der Filiale STORE_HEADER=Geschoss: STORE_OF_BRANCH_OFFICE_TITLE=Geschoss der Filiale SUITE_NUMBER_HEADER=Suite-Nummer: -ZIP_CODE_HEADER=Postleitzahl: ZIP_CODE_OF_BRANCH_OFFICE_TITLE=Postleitzahl der Filiale CITY_HEADER=Stadt: CITY_OF_BRANCH_OFFICE_TITLE=Stadt der Filiale @@ -1212,3 +1209,4 @@ AVAILABLE_HEADER=Verf\u00fcgbar: ADMIN_MANUFACTURER_HEADER=Hersteller: ADMIN_ASSIGNED_MANUFACTURER_LABEL=Zugewiesener Hersteller: BARCODE=Barcode: +ADMIN_CONTACT_DETAILS_HEADER=Kontaktdaten zu {0} {1} {2}: diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties index 41f760c4..cc5ac8b6 100644 --- a/src/java/org/mxchange/localization/generic_en_US.properties +++ b/src/java/org/mxchange/localization/generic_en_US.properties @@ -243,7 +243,6 @@ ADMIN_PERSONAL_DATA_FIRST_NAME=First name: ADMIN_PERSONAL_DATA_FAMILY_NAME=Family name: ADMIN_DATA_STREET_NAME=Name of street: ADMIN_DATA_HOUSE_NUMBER=House number: -ADMIN_DATA_ZIP_CODE=ZIP code: ADMIN_DATA_CITY=City: ADMIN_SELECT_COUNTRY=Select country: ADMIN_PERSONAL_DATA_PHONE_NUMBER=Phone number: @@ -345,7 +344,6 @@ ADMIN_CONTACT_FIRST_NAME=First name: ADMIN_CONTACT_FAMILY_NAME=Family name: ADMIN_CONTACT_STREET=Street: ADMIN_CONTACT_HOUSE_NUMBER=House number: -ADMIN_CONTACT_ZIP_CODE=ZIP code: ADMIN_CONTACT_CITY=City: DATA_EMAIL_ADDRESS=Email address: ADMIN_CONTACT_BIRTHDAY=Birthday: @@ -1106,7 +1104,6 @@ HOUSE_NUMBER_EXTENSION_OF_BRANCH_OFFICE_TITLE=House number extension of branch o STORE_HEADER=Store: STORE_OF_BRANCH_OFFICE_TITLE=Store of branch office SUITE_NUMBER_HEADER=Suite number: -ZIP_CODE_HEADER=ZIP code: ZIP_CODE_OF_BRANCH_OFFICE_TITLE=ZIP code of branch office CITY_HEADER=City: CITY_OF_BRANCH_OFFICE_TITLE=City of branch office @@ -1123,3 +1120,4 @@ AVAILABLE_HEADER=Available: ADMIN_MANUFACTURER_HEADER=Manufacturer: ADMIN_ASSIGNED_MANUFACTURER_LABEL=Assigned manufacturer: BARCODE=Barcode: +ADMIN_CONTACT_DETAILS_HEADER=Contact data of {0} {1} {2}: diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl index ddf044d7..94c88cc5 100644 --- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl +++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl @@ -85,7 +85,7 @@ - + @@ -112,7 +112,7 @@ - + diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl index c395bad6..5a0557a9 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl @@ -72,7 +72,7 @@ - + diff --git a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl index 6b4e9f96..dde0a62b 100644 --- a/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl +++ b/web/WEB-INF/templates/admin/branch_office/admin_form_branch_office_data.tpl @@ -155,7 +155,7 @@ - + diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl index 6cb52b22..f7feab04 100644 --- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl +++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl @@ -123,7 +123,7 @@ - + diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml index b5267f38..f0532eae 100644 --- a/web/admin/branch_office/admin_branch_office_list.xhtml +++ b/web/admin/branch_office/admin_branch_office_list.xhtml @@ -402,7 +402,7 @@ - + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 15ce9664..86e0a2e4 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -177,7 +177,9 @@ - + + + -- 2.39.5