From d6029712820694b02c1d4eb377d43d2dcb349735 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 5 Sep 2017 20:07:21 +0200 Subject: [PATCH] Please cherry-pick: - splitted branch office form into basic data and address data fieldsets - added much more missing i18n strings - renamed a few before adding them as they were still basic_data MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/bundle_de_DE.properties | 20 +++ .../localization/bundle_en_US.properties | 16 ++ .../admin_form_branch_offices_data.tpl | 166 ++++++++++-------- 3 files changed, 125 insertions(+), 77 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 9f0483ec..8e0fe3d5 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -870,3 +870,23 @@ ADMIN_BRANCH_OFFICE_LEGEND=Grunddaten der Filiale: #@TODO Please fix German umlauts! ADMIN_BRANCH_OFFICE_LEGEND_TITLE=Geben Sie hier die Grunddaten der Filiale ein. ADMIN_SELECT_BRANCH_OFFICE_COMPANY=Filiale einem Unternehmen zuweisen: +PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES=Filialen auflisten +CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES=Auflisten von Filialen: +ADMIN_BRANCH_OFFICES_LIST_EMPTY=Es wurden noch keine Filialen angelegt. +#@TODO Please fix German umlauts! +ADMIN_ADD_BRANCH_OFFICE_TITLE=Filiale hinzufuegen +#@TODO Please fix German umlauts! +ADMIN_ADD_BRANCH_OFFICE_MINIMUM_DATA=Bitte waehlen Sie mindestens das zugehoerige Unternehmen und das Land aus und geben Sie Strasse, Hausnummer, Postleitzahl und Stadt ein. +ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS=Email-Addresse der Filiale: +ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER=Telefonnummer eingeben: +ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER=Faxnummer eingeben: +#@TODO Please fix German umlauts! +ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED=Bitte waehlen das zur Filiale gehoerende Unternehmen aus. +ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED=Bitte geben Sie die Strasse der Filiale ein. +ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED=Bitte geben Sie die Hausnummer der Filiale ein. +#@TODO Please fix German umlauts! +ENTERED_STORE_INVALID=Die eingegebene Etage ist nicht gueltig. +#@TODO Please fix German umlauts! +ENTERED_SUITE_NUMBER_INVALID=Die eingegebene Appartmentnummer ist ungueltig. +ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND=Adressdaten der Filiale: +ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE=Geben Sie hier die Adresse der Filiale ein. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index b76e51e6..a62c4c37 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -842,3 +842,19 @@ ADMIN_SELECT_BRANCH_OFFICE_CONTACT_EMPLOYEE=Select contact person to branch offi ADMIN_BRANCH_OFFICE_LEGEND=Branch office basic data: ADMIN_BRANCH_OFFICE_LEGEND_TITLE=Enter branch office basic data here. ADMIN_SELECT_BRANCH_OFFICE_COMPANY=Assign branch office to company: +PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES=List branch offices +CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES=List branch offices: +ADMIN_BRANCH_OFFICES_LIST_EMPTY=There are no branch offices added. +ADMIN_ADD_BRANCH_OFFICE_TITLE=Add branch office +#Bitte waehlen Sie mindestens das zugehoerige Unternehmen und das Land aus und geben Sie Strasse, Hausnummer, Postleitzahl und Stadt ein. +ADMIN_ADD_BRANCH_OFFICE_MINIMUM_DATA=Please at least choose assigned company, country and enter at least street name, house number, ZIP code and city. +ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS=Email address of branch office: +ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER=Enter land-line number: +ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER=Enter fax number: +ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED=Please choose a company that sohuld be assigned with the branch office. +ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED=Please enter street name of branch office. +ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED=Please enter house number of branch office. +ENTERED_STORE_INVALID=The entered store is not valid. +ENTERED_SUITE_NUMBER_INVALID=The entered suite number is not valid. +ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND=Address data of branch office: +ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE=Enter here the address of the branch office. diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl index 247113e6..876b39aa 100644 --- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl +++ b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl @@ -7,7 +7,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
+
@@ -18,9 +18,9 @@
- + - +
@@ -68,189 +68,201 @@
- +
- + + + +
- +
- +
- + + + + + + + + + + + + +
- + - -
- -
- -
- -
+ + - +
- +
- + + + + + + + + + + + + +
- + + + + + + + + +
+ +
+ + + +
- +
- +
- +
- +
- + + +
- +
- +
- - - - - + + +
- +
- +
- - - + +
- +
- +
- - - - - - - - - - - - - +
- + - - + +
+ +
+ +
+ +
- +
- +
- + - + - - - - - - - -
- - - - - - - - - +
-- 2.39.5