From ff9a4996b5a40f389f157369d16f6cf9533aa2a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 28 Apr 2016 14:17:13 +0200 Subject: [PATCH] Continued with customers and rewrite a bit: - page show_customer "basicly finished" - removed double redundant i18n strings (no need) - added customer's i18n strings (admin) - now always handle a contact to "cellhpone templates", this is much easier and users/customers don't have cellphones/land-line or fax numbers, only contacts - added template for administrative links for customers (similar to users) - added missing navigation rules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 112 +++++++++--------- .../localization/bundle_de_DE.properties | 72 ++++------- .../localization/bundle_en_US.properties | 62 ++++++---- web/WEB-INF/faces-config.xml | 8 +- .../cellphone/admin_cellphone_add_show.tpl | 12 +- .../admin/cellphone/admin_cellphone_data.tpl | 19 ++- .../admin_contact_cellphone_show.xhtml | 10 +- web/admin/user/admin_user_show.xhtml | 62 +++++----- 8 files changed, 182 insertions(+), 175 deletions(-) diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 644e41ad..625aecb2 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,61 +2,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 2e2c81e4..e703b394 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -353,27 +353,27 @@ ERROR_PARAMETER_USER_ID_NOT_SET=Fehler: Benutzer-Id nicht gesetzt (Parameter: us ERROR_USER_ID_NOT_FOUND=Fehler: Benutzer-Id nicht gefunden. ADMIN_TABLE_SUMMARY_SHOW_USER=Zeigt ein Benutzerprofil f\u00fcr administrative Zwecke an. ADMIN_HEADER_SHOW_USER=Benutzer {0} (Nummer {1}): -ADMIN_SHOW_USER_ID=Benutzer-Id: -ADMIN_SHOW_USER_NAME=Benutzername: -ADMIN_SHOW_USER_CREATED=Wann Benutzer erstellt: -ADMIN_SHOW_USER_UPDATED=Wann Benutzerdaten ge\u00e4ndert: -ADMIN_SHOW_USER_ACCOUNT_STATUS=Account-Status: -ADMIN_SHOW_USER_PROFILE_MODE=Profilmodus: -ADMIN_SHOW_USER_LAST_LOCKED=Zuletzt gesperrt: -ADMIN_SHOW_USER_LAST_LOCKED_REASON=Letzter Sperrgrund: -ADMIN_SHOW_USER_CONTACT_CREATED=Wann Kontaktdaten erstellt: -ADMIN_SHOW_USER_CONTACT_UPDATED=Wann Kontaktdaten ge\u00e4ndert: -ADMIN_SHOW_USER_IS_OWN_CONTACT=Eigenes Account: -ADMIN_SHOW_USER_GENDER=Anrede: -ADMIN_SHOW_USER_TITLE=Titel: -ADMIN_SHOW_USER_FIRST_NAME=Vorname: -ADMIN_SHOW_USER_FAMILY_NAME=Nachname: -ADMIN_SHOW_USER_STREET=Strasse: -ADMIN_SHOW_USER_HOUSE_NUMBER=Hausnummer: -ADMIN_SHOW_USER_ZIP_CODE=Postleitzahl: -ADMIN_SHOW_USER_CITY=Stadt: -ADMIN_SHOW_USER_EMAIL_ADDRESS=Email-Adresse: -ADMIN_SHOW_USER_BIRTHDAY=Geburtstag: +ADMIN_USER_ID=Benutzer-Id: +ADMIN_USER_NAME=Benutzername: +ADMIN_USER_CREATED=Wann Benutzer erstellt: +ADMIN_USER_UPDATED=Wann Benutzerdaten ge\u00e4ndert: +ADMIN_USER_ACCOUNT_STATUS=Account-Status: +ADMIN_USER_PROFILE_MODE=Profilmodus: +ADMIN_USER_LAST_LOCKED=Zuletzt gesperrt: +ADMIN_USER_LAST_LOCKED_REASON=Letzter Sperrgrund: +ADMIN_USER_CONTACT_CREATED=Wann Kontaktdaten erstellt: +ADMIN_USER_CONTACT_UPDATED=Wann Kontaktdaten ge\u00e4ndert: +ADMIN_CONTACT_IS_OWN_CONTACT=Eigenes Account: +ADMIN_CONTACT_GENDER=Anrede: +ADMIN_CONTACT_TITLE=Titel: +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: +ADMIN_CONTACT_EMAIL_ADDRESS=Email-Adresse: +ADMIN_CONTACT_BIRTHDAY=Geburtstag: ADMIN_LINKS_HEADER=Administrative Links: ADMIN_LINK_EDIT_USER=Benutzerdaten editieren ADMIN_LINK_EDIT_USER_TITLE=Editieren der Benutzerdaten. @@ -430,48 +430,20 @@ ADMIN_EDIT_CONTACT_TITLE=Kontaktdaten editieren (Id-Nummer: {0}) BUTTON_ADMIN_EDIT_CONTACT=Kontaktdaten \u00e4ndern PAGE_TITLE_ADMIN_LIST_CONTACT=Kotaktdaten auflisten CONTENT_TITLE_ADMIN_LIST_CONTACT=Kontaktdaten auflisten: -LINK_ADMIN_LIST_CUSTOMER=Kunden auflisten -LINK_ADMIN_LIST_CUSTOMER_TITLE=Alle bestehenden Kunden auflisten. -PAGE_TITLE_ADMIN_LIST_CUSTOMER=Kunden auflisten -CONTENT_TITLE_ADMIN_LIST_CUSTOMER=Auflisten von Kunden: -PAGE_TITLE_ADMIN_EDIT_CUSTOMER=Benuzteraccount editieren -CONTENT_TITLE_ADMIN_EDIT_CUSTOMER=\u00c4ndern von Kunden: -PAGE_TITLE_ADMIN_UNLOCK_CUSTOMER=Ent-/Sperren von Kunden -CONTENT_TITLE_ADMIN_UNLOCK_CUSTOMER=Ent-/Sperren von Kunden: -PAGE_TITLE_ADMIN_SHOW_CUSTOMER=Anzeigen eines Kundens -CONTENT_TITLE_ADMIN_SHOW_CUSTOMER=Anzeigen eines Kundens: -ADMIN_MENU_CUSTOMER_TITLE=Kunden -BUTTON_ADMIN_ADD_CUSTOMER=Kunde hinzuf\u00fcgen -ADMIN_ADD_CUSTOMER_TITLE=Neuen Kunden anlegen -ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE=Die Kundennummer wird automatisch vergeben. Bitte mindestens Anrede, Vor- und Nachname eingeben. PAGE_TITLE_LOGIN_AREA=Benutzerbereich ADMIN_SELECT_USER_CONTACT_LEGEND=Kontakt f\u00fcr neues Benutzeraccount ausw\u00e4hlen: ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE=W\u00e4hlen Sie entweder einen Kontakt aus, der mit dem neuen Benutzeraccount verkn\u00fcpft werden soll ... ADMIN_SELECT_USER_CONTACT=Kontakt zum Verkn\u00fcpfen ausw\u00e4hlen: ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA=... oder geben Sie mindestens Anrede, Vorname und Nachname ein (Benutzername und Email-Adresse nicht vergessen): -ADMIN_ADD_CUSTOMER_OR_ENTER_CONTACT_DATA=... oder geben Sie mindestens Anrede, Vorname und Nachname ein. -ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND=Kontakt f\u00fcr neuen Kunden ausw\u00e4hlen: -ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND_TITLE=W\u00e4hlen Sie entweder einen Kontakt aus, der mit dem neuen Kunden verkn\u00fcpft werden soll ... -ADMIN_SELECT_CUSTOMER_CONTACT=Kontakt zum Verkn\u00fcpfen ausw\u00e4hlen: ADMIN_CONTACT_CREATED=Erstellt: ADMIN_ADD_CONTACT_TITLE=Neue Kontaktdaten hinzuf\u00fcgen BUTTON_ADMIN_ADD_CONTACT=Kontaktdaten hinzuf\u00fcgen CONTACT_IS_UNUSED=Nicht verlinkt -CONTACT_IS_USER_CUSTOMER=Benutzer und Kunde CONTACT_IS_USER=Ist Benutzer -CONTACT_IS_CUSTOMER=Ist Kunde ADMIN_CONTACT_USAGE=In Verwendung: -ADMIN_CUSTOMER_ID=Kunden-Id: -ADMIN_CUSTOMER_NUMBER=Kundennummer: -ADMIN_CUSTOMER_ACCOUNT_STATUS=Kundenstatus: -CUSTOMER_ACCOUNT_STATUS_CONFIRMED=Best\u00e4tigt -CUSTOMER_ACCOUNT_STATUS_UNCONFIRMED=Unbest\u00e4tigt -CUSTOMER_ACCOUNT_STATUS_LOCKED=Gesperrt -ADMIN_CUSTOMER_CREATED=Kunden erstellt: ADMIN_LINK_SHOW_CONTACT_TITLE=Kontaktdaten anzeigen -ADMIN_LINK_SHOW_CUSTOMER_TITLE=Kundendaten anzeigen ADMIN_MENU_CONTACT_TITLE=Manage contact data LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden. -ERROR_PARAMETER_CELLPHONE_NUMBER_USER_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'user' nicht gesetzt. +ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'contact' nicht gesetzt. ADMIN_ADD_CONTACT_MINIMUM_DATA=Bitte geben Sie mindestens Anrede, Vorname und Nachname an. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 8c5cc527..baa53cbe 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -332,27 +332,27 @@ ERROR_PARAMETER_USER_ID_NOT_SET=Error: User id not set (parameter userId). ERROR_USER_ID_NOT_FOUND=Error: User id not found. ADMIN_TABLE_SUMMARY_SHOW_USER=Shows a single user profile for administrative purposes. ADMIN_HEADER_SHOW_USER=User {0} (id {1}): -ADMIN_SHOW_USER_ID=User id: -ADMIN_SHOW_USER_NAME=User name: -ADMIN_SHOW_USER_CREATED=When user created: -ADMIN_SHOW_USER_UPDATED=When user data updated: -ADMIN_SHOW_USER_ACCOUNT_STATUS=Account status: -ADMIN_SHOW_USER_PROFILE_MODE=Profile mode: -ADMIN_SHOW_USER_LAST_LOCKED=Last locked: -ADMIN_SHOW_USER_LAST_LOCKED_REASON=Last lock reason: -ADMIN_SHOW_USER_CONTACT_CREATED=When contact data created: -ADMIN_SHOW_USER_CONTACT_UPDATED=When contact data updated: -ADMIN_SHOW_USER_IS_OWN_CONTACT=Own account: -ADMIN_SHOW_USER_GENDER=Gender: -ADMIN_SHOW_USER_TITLE=Title: -ADMIN_SHOW_USER_FIRST_NAME=First name: -ADMIN_SHOW_USER_FAMILY_NAME=Family name: -ADMIN_SHOW_USER_STREET=Street: -ADMIN_SHOW_USER_HOUSE_NUMBER=House number: -ADMIN_SHOW_USER_ZIP_CODE=ZIP code: -ADMIN_SHOW_USER_CITY=City: -ADMIN_SHOW_USER_EMAIL_ADDRESS=Email address: -ADMIN_SHOW_USER_BIRTHDAY=Birthday: +ADMIN_USER_ID=User id: +ADMIN_USER_NAME=User name: +ADMIN_USER_CREATED=When user created: +ADMIN_USER_UPDATED=When user data updated: +ADMIN_USER_ACCOUNT_STATUS=Account status: +ADMIN_USER_PROFILE_MODE=Profile mode: +ADMIN_USER_LAST_LOCKED=Last locked: +ADMIN_USER_LAST_LOCKED_REASON=Last lock reason: +ADMIN_USER_CONTACT_CREATED=When contact data created: +ADMIN_USER_CONTACT_UPDATED=When contact data updated: +ADMIN_CONTACT_IS_OWN_CONTACT=Own account: +ADMIN_CONTACT_GENDER=Gender: +ADMIN_CONTACT_TITLE=Title: +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: +ADMIN_CONTACT_EMAIL_ADDRESS=Email address: +ADMIN_CONTACT_BIRTHDAY=Birthday: ADMIN_LINKS_HEADER=Administrative links: ADMIN_LINK_EDIT_USER=Edit user data ADMIN_LINK_EDIT_USER_TITLE=Editing of user and contact data. @@ -407,5 +407,21 @@ ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE=If you want to change the password, enter i ERROR_PARAMETER_MODE_NOT_SET=Error: Parameter 'modus' is not set. ADMIN_EDIT_CONTACT_TITLE=Edit contact data (id number: {0}) BUTTON_ADMIN_EDIT_CONTACT=Change contact data -PAGE_TITLE_ADMIN_LIST_CONTACT=List contacts -CONTENT_TITLE_ADMIN_LIST_CONTACT=List contacts: +PAGE_TITLE_ADMIN_LIST_CONTACT=List contact entries +CONTENT_TITLE_ADMIN_LIST_CONTACT=List contact entries: +ADMIN_SELECT_USER_CONTACT_LEGEND=Select contact for new user account: +ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE=Whether choose a contact that should be linked with the new user account or ... +ADMIN_SELECT_USER_CONTACT=Select contact for linking: +ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA=... or enter gender, first name and family name (don't forget to enter user name and email address): +ADMIN_CONTACT_CREATED=Created: +ADMIN_ADD_CONTACT_TITLE=Add new contact data +BUTTON_ADMIN_ADD_CONTACT=Add contact data +CONTACT_IS_UNUSED=Not linked +CONTACT_IS_USER=Is a user +ADMIN_CONTACT_USAGE=Usage: +ADMIN_LINK_SHOW_CONTACT_TITLE=Show contact data +ADMIN_MENU_CONTACT_TITLE=Manage contact data +LINK_ADMIN_LIST_CONTACT=List contact data +LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created. +ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'cellphoneNumber' and 'contact' are not set. +ADMIN_ADD_CONTACT_MINIMUM_DATA=Please enter at least gender, first name and family name. diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index ee1d87bb..66cbdb2b 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -268,6 +268,10 @@ /admin/user/admin_user_show.xhtml + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + admin_show_contact_cellphone /admin/cellphone/admin_contact_cellphone_show.xhtml @@ -300,10 +304,6 @@ admin_edit_contact /admin/contact/admin_contact_edit.xhtml - - admin_show_mobile_provider - /admin/mobile_provider/admin_mobile_provider_show.xhtml - /admin/cellphone/admin_contact_cellphone_list.xhtml diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl index 2f3ec755..02a8c00b 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl @@ -5,16 +5,20 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + + + + + - + - + - + diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl index 47ce5c93..2b870a45 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl @@ -37,11 +37,20 @@
- - - - - + + + + + + + + + + + + + +
diff --git a/web/admin/cellphone/admin_contact_cellphone_show.xhtml b/web/admin/cellphone/admin_contact_cellphone_show.xhtml index c10bbfcf..e46b92af 100644 --- a/web/admin/cellphone/admin_contact_cellphone_show.xhtml +++ b/web/admin/cellphone/admin_contact_cellphone_show.xhtml @@ -42,31 +42,31 @@ - + - + - + - + - + diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index 9d926375..aa679c85 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -31,19 +31,19 @@ - + - + - + @@ -51,7 +51,7 @@ - + @@ -59,19 +59,19 @@ - + - + - + @@ -79,13 +79,13 @@ - + - + @@ -93,7 +93,7 @@ - + @@ -101,61 +101,61 @@ - + - + - + - + - + - + - + - + - + - + @@ -163,7 +163,7 @@ - + @@ -171,14 +171,18 @@ - - - - - - - - +
+ + + +
+ +
+ + + + +
-- 2.39.5