From 4d6ee4b2c4b4e3cf70f05ce247b5ce433531adda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 25 Apr 2016 17:27:31 +0200 Subject: [PATCH] Some rewrites: - use customer's own templates (maybe needs changing, unfinished work) - fixed some i18n strings + added some missing 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 | 6 +++++- .../localization/bundle_en_US.properties | 5 ++++- .../admin_form_customer_personal_data.tpl | 20 +++++++++++++++++++ .../user/admin_form_user_personal_data.tpl | 2 +- web/admin/contact/admin_contact_edit.xhtml | 2 +- web/admin/customer/admin_customer_list.xhtml | 6 +++--- web/admin/user/admin_user_edit.xhtml | 2 +- 7 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index a5d2b57a..47969ef9 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -135,7 +135,7 @@ PAGE_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen CONTENT_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen: TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, alle Benutzer auflisten ADMIN_ADD_USER_TITLE=Neues Benutzeraccount anlegen -ADMIN_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Vor- und Nachnamen, sowie Benutzernamen und Email-Adresse ein. +ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Vor- und Nachnamen, sowie Benutzernamen und Email-Adresse ein. ADMIN_CONTACT_PERSONAL_DATA_LEGEND=Pers\u00f6nliche Daten des Benutzers: ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE=Geben Sie hier die pers\u00f6nlichen Daten des neuen Benutzers ein. ADMIN_PERSONAL_DATA_GENDER=Anrede ausw\u00e4hlen: @@ -323,3 +323,7 @@ CONTENT_TITLE_ADMIN_UNLOCK_CUSTOMER=Ent-/Sperren von Kunden: PAGE_TITLE_ADMIN_SHOW_CUSTOMER=Anzeigen des Kundenaccounts CONTENT_TITLE_ADMIN_SHOW_CUSTOMER=Anzeigen des Kundenaccounts: ADMIN_MENU_CUSTOMER_TITLE=Kundenverwaltung +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 diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 19907f0d..38b85205 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -136,7 +136,7 @@ PAGE_TITLE_ADMIN_ADD_USER=Add new user account CONTENT_TITLE_ADMIN_ADD_USER=Add new user account: TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, list all users ADMIN_ADD_USER_TITLE=Create a new user account -ADMIN_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least first name, family name, user name and email address. +ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least first name, family name, user name and email address. ADMIN_CONTACT_PERSONAL_DATA_LEGEND=Personal data of the user: ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE=Here you can enter the personal data of the new user. ADMIN_PERSONAL_DATA_GENDER=Select gender: @@ -325,3 +325,6 @@ CONTENT_TITLE_ADMIN_UNLOCK_CUSTOMER=Un-/Lock customer accounts: PAGE_TITLE_ADMIN_SHOW_CUSTOMER=Shpw customer account CONTENT_TITLE_ADMIN_SHOW_CUSTOMER=Show customer account: ADMIN_MENU_CUSTOMER_TITLE=Customer management +BUTTON_ADMIN_ADD_CUSTOMER=Add customer +ADMIN_ADD_CUSTOMER_TITLE=Create new customer +ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE=The customer number is being created automatically. Please enter at least gender, first name and family name. diff --git a/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl b/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl new file mode 100644 index 00000000..f086074f --- /dev/null +++ b/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl @@ -0,0 +1,20 @@ + + + +
+ #{msg.ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE} +
+ + + + + diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl index b6a1bd1d..13ff590d 100644 --- a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl +++ b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl @@ -6,7 +6,7 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE} + #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index d2e7ea01..1b92701f 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -32,7 +32,7 @@
- #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE} + #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
diff --git a/web/admin/customer/admin_customer_list.xhtml b/web/admin/customer/admin_customer_list.xhtml index f8d6b7c9..8cd88e59 100644 --- a/web/admin/customer/admin_customer_list.xhtml +++ b/web/admin/customer/admin_customer_list.xhtml @@ -73,14 +73,14 @@
- #{msg.ADMIN_ADD__CUSTOMER_TITLE} + #{msg.ADMIN_ADD_CUSTOMER_TITLE}
- +
- +
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index a13b4077..da1db9e6 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -30,7 +30,7 @@
- #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE} + #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
-- 2.39.5