From 1c7cfe380b6cc81c123cf3617e77cc145d75bccf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 25 Mar 2018 04:15:23 +0200 Subject: [PATCH] Please cherry-pick: - renamed admin_form_mobile_data.tpl to admin_edit_form_mobile_data.tpl as this tag is for editing mobile numbers - started cleanup by removing no longer valid (PF + jquery-ui have own stuff)
tags - reformatted more p:inputText - size="10" for Number is a bit to short, let's take 20 again - size="20" for email addresses is a bit to short, let's take 40 then - replace more h:outputLink with p:link, need to take href attribute with this tag then - renamed *_LANDLINE_* i18n keys to *_LAND_LINE_* - used p:outputPanel instead of plain
tag, may now lesser break - no size of landline/fax number (not area-code) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/generic_de_DE.properties | 18 +++++++++------ .../localization/generic_en_US.properties | 18 +++++++++------ .../columns/admin_contact_data_columns.tpl | 4 ++-- .../admin_contact_data_columns_mini.tpl | 4 ++-- ...ta.tpl => admin_edit_form_mobile_data.tpl} | 23 +++++++++---------- .../mini/landline/admin_landline_links.tpl | 8 +++---- .../input/panel_grid/fax_input_panel_grid.tpl | 17 ++++++++++++-- .../panel_grid/landline_input_panel_grid.tpl | 17 ++++++++++++-- .../panel_grid/mobile_input_panel_grid.tpl | 15 ++++++++++-- .../basic_data/admin_form_basic_data.tpl | 23 ++++++++++++++++--- .../admin_form_branch_office_data.tpl | 8 ++++++- .../employee/admin_form_employee_data.tpl | 8 ++++++- .../headquarter/admin_form_headquarter.tpl | 8 ++++++- web/WEB-INF/widgets.jsf.taglib.xml | 22 ++++++++++++++++-- web/admin/contact/admin_contact_export.xhtml | 2 +- web/admin/fax/admin_fax_show.xhtml | 4 ++-- web/admin/landline/admin_landline_list.xhtml | 4 ++-- web/admin/landline/admin_landline_show.xhtml | 6 ++--- web/admin/mobile/admin_mobile_show.xhtml | 8 +++---- web/admin/user/admin_user_export.xhtml | 2 +- 20 files changed, 158 insertions(+), 61 deletions(-) rename web/WEB-INF/resources/tags/admin/form_data/mobile/{admin_form_mobile_data.tpl => admin_edit_form_mobile_data.tpl} (79%) diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties index 532e1845..4fbd04ea 100644 --- a/src/java/org/mxchange/localization/generic_de_DE.properties +++ b/src/java/org/mxchange/localization/generic_de_DE.properties @@ -477,7 +477,7 @@ ADMIN_LINK_LIST_CONTACT=Kontaktdaten ADMIN_LINK_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden. ADMIN_CONTACT_COUNTRY_CODE=L\u00e4ndercode: ADMIN_CONTACT_MOBILE_NUMBER=Handynummer: -ADMIN_CONTACT_LANDLINE_NUMBER=Telefonnummer: +ADMIN_CONTACT_LAND_LINE_NUMBER=Telefonnummer: ADMIN_CONTACT_FAX_NUMBER=Faxnummer: PAGE_TITLE_ADMIN_EXPORT_CONTACT=Kontaktdaten exportieren CONTENT_TITLE_ADMIN_EXPORT_CONTACT=Kontaktdaten exportieren: @@ -503,7 +503,7 @@ ADMIN_EXPORT_CONTACT_CITY=Wohnort ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS=Email-Adresse ADMIN_EXPORT_CONTACT_BIRTHDAY=Geburtsdatum ADMIN_EXPORT_CONTACT_MOBILE_NUMBER=Handynummer -ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER=Festnetznummer +ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER=Festnetznummer ADMIN_EXPORT_CONTACT_FAX_NUMBER=Faxnummer ADMIN_EXPORT_CONTACT_CREATED=Eintrag erstellt GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED=Bitte geben Sie Ihren Vornamen ein. @@ -892,12 +892,12 @@ 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. +ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE=Zeigt Details zur Festnetznummer an. +ADMIN_LINK_EDIT_LAND_LINE_NUMBER_TITLE=Editieren der Festnetznummer. #@TODO Please fix German umlauts! -ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE=Entfernt die Verkuepfung der Festnetznummer vom Kontakt. +ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE=Entfernt die Verkuepfung der Festnetznummer vom Kontakt. #@TODO Please fix German umlauts! -ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE=Loescht die Festnetznummer. +ADMIN_LINK_DELETE_LAND_LINE_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. @@ -932,7 +932,7 @@ ADMIN_EMPTY_LIST_COUNTRY=Es befinden sich keine Laender in der Datenbank. Oder I #@TODO Please fix German umlauts! ADMIN_EMPTY_LIST_FAX_NUMBER=Es befinden sich keine Faxnummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen. #@TODO Please fix German umlauts! -ADMIN_EMPTY_LIST_LANDLINE_NUMBER=Es befinden sich keine Festnetznummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen. +ADMIN_EMPTY_LIST_LAND_LINE_NUMBER=Es befinden sich keine Festnetznummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen. #@TODO Please fix German umlauts! ADMIN_EMPTY_LIST_MOBILE_NUMBER=Es befinden sich keine Mobilfunknummern in der Datenbank oder Ihre Suche ergab keine Uebereinstimmungen. #@TODO Please fix German umlauts! @@ -1158,3 +1158,7 @@ COUNTRY_ITALIA=Italien ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Bitte geben Sie das Geburtsdatum des Kontaktes ein. ADMIN_SELECT_USER_PROFILE_MODE=Profilmodus ausw\u00e4hlen: ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Filialbesitzer/-leiter +ADMIN_LAND_LINE_AREA_CODE_REQUIRED=Bitte geben Sie die Vorwahlnummer zur Festnetznummer ein. +ADMIN_LAND_LINE_NUMBER_REQUIRED=Bitte geben Sie die Rufnummer zur Festnetznummer ein. +ADMIN_FAX_AREA_CODE_REQUIRED=Bitte geben Sie die Vorwahlnummer zur Faxnummer ein. +ADMIN_FAX_NUMBER_REQUIRED=Bitte geben Sie die Rufnummer zur Faxnummer ein. diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties index 6b51d5c7..56523449 100644 --- a/src/java/org/mxchange/localization/generic_en_US.properties +++ b/src/java/org/mxchange/localization/generic_en_US.properties @@ -465,7 +465,7 @@ ADMIN_LINK_LIST_CONTACT=Contact data ADMIN_LINK_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created. ADMIN_CONTACT_COUNTRY_CODE=Country code: ADMIN_CONTACT_MOBILE_NUMBER=Mobile number: -ADMIN_CONTACT_LANDLINE_NUMBER=Phone number: +ADMIN_CONTACT_LAND_LINE_NUMBER=Phone number: ADMIN_CONTACT_FAX_NUMBER=Fax number: PAGE_TITLE_ADMIN_EXPORT_CONTACT=Export contact data CONTENT_TITLE_ADMIN_EXPORT_CONTACT=Export contact data: @@ -491,7 +491,7 @@ ADMIN_EXPORT_CONTACT_CITY=City ADMIN_EXPORT_CONTACT_EMAIL_ADDRESS=Email address ADMIN_EXPORT_CONTACT_BIRTHDAY=Birthday ADMIN_EXPORT_CONTACT_MOBILE_NUMBER=Mobile number -ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER=Land-line number +ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER=Land-line number ADMIN_EXPORT_CONTACT_FAX_NUMBER=Fax number ADMIN_EXPORT_CONTACT_CREATED=Entry created GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED=Please enter your first name. @@ -846,10 +846,10 @@ 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 a land-line number. -ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE=Edit of a land-line number. -ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE=Unlinks land-line number from contact. -ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE=Deletes a land-line number. +ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE=Shows details to a land-line number. +ADMIN_LINK_EDIT_LAND_LINE_NUMBER_TITLE=Edit of a land-line number. +ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE=Unlinks land-line number from contact. +ADMIN_LINK_DELETE_LAND_LINE_NUMBER_TITLE=Deletes a land-line number. ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE=Unlinks mobile number from contact. ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE=Shows details of a mobile number. ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE=Unlinks fax number from contact. @@ -873,7 +873,7 @@ ADMIN_LINK_EDIT_COUNTRY_TITLE=Edit of a country. ADMIN_LINK_DELETE_COUNTRY_TITLE=Deletes a country. ADMIN_EMPTY_LIST_COUNTRY=There are no countries in database. Or your search criteria doesn't match anything. ADMIN_EMPTY_LIST_FAX_NUMBER=There are no fax numbers in database. Or your search criteria doesn't match anything. -ADMIN_EMPTY_LIST_LANDLINE_NUMBER=There are no land-line numbers in database. Or your search criteria doesn't match anything. +ADMIN_EMPTY_LIST_LAND_LINE_NUMBER=There are no land-line numbers in database. Or your search criteria doesn't match anything. ADMIN_EMPTY_LIST_MOBILE_NUMBER=There are no mobile numbers in database. Or your search criteria doesn't match anything. ADMIN_EMPTY_LIST_CONTACT_MOBILE=There are no mobile numbers of contacts in database. Or your search criteria doesn't match anything. ADMIN_MOBILE_PROVIDER_COUNTRY_REQUIRED=Please select a country for mobile provider. @@ -1046,3 +1046,7 @@ COUNTRY_ITALIA=Italia ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Please enter birthday of contact. ADMIN_SELECT_USER_PROFILE_MODE=Select profile mode: ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Branch office owner/leader +ADMIN_LAND_LINE_AREA_CODE_REQUIRED=Please enter an area-code for land-line number. +ADMIN_LAND_LINE_NUMBER_REQUIRED=Please enter caller number for land-line number. +ADMIN_FAX_AREA_CODE_REQUIRED=Please enter an area-code for fax number. +ADMIN_FAX_NUMBER_REQUIRED=Please enter caller number for fax number. 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 d60ab1a2..f79cb3ce 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 @@ -98,9 +98,9 @@ - + - + diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl index 72ad507f..d5ff8f99 100644 --- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl +++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl @@ -34,8 +34,8 @@ - + - + diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl similarity index 79% rename from web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl rename to web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl index a5f194d5..d938eb34 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_edit_form_mobile_data.tpl @@ -24,11 +24,8 @@ -
-
-
-
@@ -49,15 +45,18 @@ -
- -
+ -
- - - -
+ + + diff --git a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl index c1d9c669..c4845dc9 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl @@ -11,14 +11,14 @@
  • - +
  • - +
    • @@ -26,7 +26,7 @@
  • - + @@ -35,7 +35,7 @@
  • - +
    • diff --git a/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl index 6b3f8925..fea58106 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/fax_input_panel_grid.tpl @@ -9,11 +9,24 @@ - + - + diff --git a/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl index 4c75c4be..161f7212 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/landline_input_panel_grid.tpl @@ -9,11 +9,24 @@ - + - + diff --git a/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl index e8a03909..8e88242d 100644 --- a/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl +++ b/web/WEB-INF/resources/tags/input/panel_grid/mobile_input_panel_grid.tpl @@ -14,10 +14,21 @@ > - + - + diff --git a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl index d9cfe262..2f831a99 100644 --- a/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl +++ b/web/WEB-INF/templates/admin/basic_data/admin_form_basic_data.tpl @@ -28,7 +28,13 @@ - + @@ -36,10 +42,21 @@