From 4fcf1c6e77ef0b41c14fd0530ae664d01b2f47d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 12 Sep 2017 22:59:02 +0200 Subject: [PATCH] Please cherry-pick: - introduced JSF tag outputBasicDataAdminLinks which will render administrative links for basic company data - all short navigational links now have full-explaining title attribute - added missing navigation cases for edit/delete basic company 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 | 25 +++++++++++++-- .../localization/bundle_en_US.properties | 16 +++++++++- web/WEB-INF/faces-config.xml | 8 +++++ .../basic_data/admin_basic_data_links.tpl | 32 +++++++++++++++++++ .../tags/admin/links/fax/admin_fax_links.tpl | 8 ++--- .../links/landline/admin_landline_links.tpl | 8 ++--- .../admin/links/mobile/admin_mobile_links.tpl | 8 ++--- web/WEB-INF/widgets.jsf.taglib.xml | 23 +++++++++++++ .../admin_basic_company_data_list.xhtml | 8 +++++ web/admin/fax/admin_fax_list.xhtml | 4 +-- web/admin/fax/admin_fax_show.xhtml | 2 +- web/admin/landline/admin_landline_list.xhtml | 2 +- web/admin/landline/admin_landline_show.xhtml | 2 +- web/admin/mobile/admin_mobile_list.xhtml | 16 +++++----- web/admin/mobile/admin_mobile_show.xhtml | 2 +- 15 files changed, 134 insertions(+), 30 deletions(-) create mode 100644 web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 30d41a8c..51ab88fa 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -885,8 +885,8 @@ ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE=Geben Sie hier die Adresse der Filiale ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED=Bitte geben Sie die Postleitzahl zur Filiale ein. ADMIN_BRANCH_OFFICE_CITY_REQUIRED=Bitte geben Sie die Stadt der Filiale ein. ADMIN_BRANCH_OFFICE_ALREADY_CREATED=Eine Filiale existiert bereits mit den angegebenen Daten. -ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE=Zeige Details dieser Filiale an. -ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE=Zeit das Benutzerprofil des Besitzers des Filialeintrages an. +ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE=Zeigt Details dieser Filiale an. +ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE=Zeigt das Benutzerprofil des Besitzers des Filialeintrages an. ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE=Dieser Filiale einen Benutzer als Besitzer zuweisen. ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE=Zeit die Daten der Kontaktperson dieser Filiale an. ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE=Einen Mitarbeiter als Kontaktperson dieser Filiale zuweisen. @@ -894,5 +894,24 @@ NO_EMAIL_ADDRESS_ENTERED=Keine Email-Adresse eingegeben. DATA_ADDRESS=Adresse DATA_STORE=Etage: DATA_SUITE_NUMBER=Appartmentnummer: +ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE=Zeigt Details zur Festnetznummer an. +ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE=Editieren der Festnetznummer. #@TODO Please fix German umlauts! -PARAMETER_ADDRESSBOOK_ID_NOT_FOUND=Der angeklickte Link ist nicht mehr gueltig: Addressbook mit der eingegebenen Id-Nummer existiert nicht mehr. +ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE=Entfernt die Verkuepfung der Festnetznummer vom Kontakt. +#@TODO Please fix German umlauts! +ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE=Loescht die Festnetznummer. +#@TODO Please fix German umlauts! +ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE=Entfernt die Verknuepfung der Mobilfunknummer vom Kontakt. +ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE=Zeigt Details zur Mobilfunknummer an. +ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE=Entfernt Verlinkung der Faxnummer vom Kontakt. +ADMIN_LINK_SHOW_FAX_NUMBER_TITLE=Zeigt Details zur Faxnummer an. +#@TODO Please fix German umlauts! +ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE=Loescht die Mobilfunknummer. +ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE=Editieren der Mobilfunknummer. +#@TODO Please fix German umlauts! +ADMIN_LINK_DELETE_FAX_NUMBER_TITLE=Loescht die Faxnummer. +ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Editieren der Faxnummer. +ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edieren von Grunddaten des Unternehmens. +#@TODO Please fix German umlauts! +ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Loescht Grunddaten des Unternehmens. +ADMIN_ACTION_LINKS=Aktionen: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index ced58b6d..b34e2318 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -130,7 +130,6 @@ COUNTRY_PHILIPPINES=Philippines NONE_SELECTED=Empty ENTERED_HOUSE_NUMBER_INVALID=The entered house number is invalid. ENTERED_ZIP_CODE_INVALID=The entered ZIP code is invalid. -PARAMETER_ADDRESSBOOK_ID_NOT_FOUND=The clicked link is no longer valid: Address book with entered id number does not exist (anymore). TABLE_HEADER_USER_LIST=List all users TABLE_SUMMARY_USER_LIST=This table lists all registered users you can share your address books with. USER_PROFILE_LEGEND=Publicly visible profile: @@ -861,3 +860,18 @@ NO_EMAIL_ADDRESS_ENTERED=No email address entered. DATA_ADDRESS=Address DATA_STORE=Store: DATA_SUITE_NUMBER=Suite number: +ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE=Shows details to land-line number. +ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE=Edit of land-line number. +ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE=Unlinks land-line number from contact. +ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE=Deletes land-line number. +ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE=Unlinks mobile number from contact. +ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE=Shows details of mobile number. +ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE=Unlinks fax number from contact. +ADMIN_LINK_SHOW_FAX_NUMBER_TITLE=Shows details of fax number. +ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE=Deletes mobile mobile. +ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE=Edit of mobile number +ADMIN_LINK_DELETE_FAX_NUMBER_TITLE=Deletes fax number. +ADMIN_LINK_EDIT_FAX_NUMBER_TITLE=Edit of fax number. +ADMIN_LINK_EDIT_BASIC_COMAPNY_DATA_TITLE=Edit of basic data of company. +ADMIN_LINK_DELETE_BASIC_COMAPNY_DATA_TITLE=Deletes basic data of company. +ADMIN_ACTION_LINKS=Actions: diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index c6cb418f..3fc8dc80 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -712,6 +712,14 @@ admin_show_basic_data /admin/basic_company_data/admin_basic_company_data_show.xhtml + + admin_edit_basic_data + /admin/basic_company_data/admin_basic_company_data_edit.xhtml + + + admin_delete_basic_data + /admin/basic_company_data/admin_basic_company_data_delete.xhtml + admin_assign_basic_company_data_contact /admin/basic_company_data/admin_basic_company_data_assign_contact.xhtml diff --git a/web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl new file mode 100644 index 00000000..10c6b8c6 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/links/basic_data/admin_basic_data_links.tpl @@ -0,0 +1,32 @@ + + + + + + + diff --git a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl index 22ab97e7..ec4645b1 100644 --- a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl @@ -9,14 +9,14 @@