From 53814403e2e3862cd1f342fd3bc3443e65968849 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Apr 2016 15:16:16 +0200 Subject: [PATCH] Continued with customer: - editing customer data is "basicly finished" - removed i18n key as this was not following convention (and redundant) - a user entry was not found (for users more clear) 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 | 4 ++-- .../localization/bundle_en_US.properties | 4 ++-- .../templates/generic/user_profile_link.tpl | 16 +++++++++++++ web/admin/customer/admin_customer_edit.xhtml | 23 ++++++++++++++++++- 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 web/WEB-INF/templates/generic/user_profile_link.tpl diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index cec1aaec..cfa34bd7 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -104,7 +104,6 @@ LOGIN_NO_PASSWORD_MESSAGE=Sie haben kein Passwort eingegeben. LOGIN_NO_USER_NAME_MESSAGE=Sie haben keinen Benutzernamen eingegeben. USER_NOT_LOGGED_IN=Sie sind nicht angemeldet. LOGIN_OWN_PROFILE_INVISIBLE=Ihr Profil ist auf "durchsichtig" gestellt. -ERROR_USER_INSTANCE_NOT_SET=Fehler: Benutzer-Instanz nicht gesetzt. TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN=Sie m\u00fcssen angemeldet sein USER_IS_NOT_LOGGED_IN_FULL=Damit diese Funktion nutzen k\u00f6nnen, m\u00fcssen Sie sich anmelden und in Ihren Account eingeloggt sein. ERROR_CURRENT_PASSWORD_MISMATCHING=Ihr eingegebenes Passwort entspricht nicht dem aktuell gespeicherten Passwort. @@ -233,7 +232,7 @@ ADMIN_LINK_SHOW_USER_TITLE=Administratives Benutzerprofil anzeigen PAGE_TITLE_ADMIN_SHOW_USER=Benutzerprofil anzeigen CONTENT_TITLE_ADMIN_SHOW_USER=Profil eines Benutzers anzeigen: ERROR_PARAMETER_USER_ID_NOT_SET=Fehler: Benutzer-Id nicht gesetzt (Parameter: userId). -ERROR_USER_ID_NOT_FOUND=Fehler: Benutzer-Id nicht gefunden. +ERROR_USER_ID_NOT_FOUND=Fehler: Benutzereintrag nicht gefunden. ADMIN_TABLE_SUMMARY_SHOW_USER=Zeigt ein Benutzerprofil f\u00fcr administrative Zwecke an. ADMIN_HEADER_SHOW_USER=Benutzer {0} (Nummer {1}): ADMIN_USER_ID=Benutzer-Id: @@ -381,3 +380,4 @@ ADMIN_DELETE_CONTACT_TITLE=Kontaktdaten unwiederruflich l\u00f6schen BUTTON_ADMIN_DELETE_CONTACT=Kontaktdaten l\u00f6schen ADMIN_DELETE_CONTACT_NOTICE=Sie wollen Kontaktdaten l\u00f6schen. Diese k\u00f6nnten noch evtl. mit anderen Daten verkn\u00fcft sein, was zu Fehlern f\u00fchrt. Bitte l\u00f6schen Sie nur, wenn Sie sich absolut sicher sind, dass keine fremden Daten auf diesen Datensatz mehr verweisen. ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Anrede, Vor- und Nachnamen ein. +ERROR_CUSTOMER_ID_NOT_FOUND=Fehler: Kundeneintrag nicht gefunden. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index ff183ae6..2bdddab3 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -105,7 +105,6 @@ LOGIN_NO_PASSWORD_MESSAGE=You have entered no password. LOGIN_NO_USER_NAME_MESSAGE=You have entered no user name. USER_NOT_LOGGED_IN=You are not signed in. LOGIN_OWN_PROFILE_INVISIBLE=Your profile is set to "invisible". -ERROR_USER_INSTANCE_NOT_SET=Error: User instance not set. TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN=You need to be logged-in USER_IS_NOT_LOGGED_IN_FULL=To use this feature you need to register and be logged-in into your account. ERROR_CURRENT_PASSWORD_MISMATCHING=Your entered password doesn't match the currently stored one. @@ -234,7 +233,7 @@ ADMIN_LINK_SHOW_USER_TITLE=Show administrative user profile PAGE_TITLE_ADMIN_SHOW_USER=Show user profile CONTENT_TITLE_ADMIN_SHOW_USER=Show profile of a user: ERROR_PARAMETER_USER_ID_NOT_SET=Error: User id not set (parameter userId). -ERROR_USER_ID_NOT_FOUND=Error: User id not found. +ERROR_USER_ID_NOT_FOUND=Error: User entry not found. ADMIN_TABLE_SUMMARY_SHOW_USER=Shows a single user profile for administrative purposes. ADMIN_HEADER_SHOW_USER=User {0} (id {1}): ADMIN_USER_ID=User id: @@ -382,3 +381,4 @@ ADMIN_DELETE_CONTACT_TITLE=Delete contact data unreverseable BUTTON_ADMIN_DELETE_CONTACT=Delete contact data ADMIN_DELETE_CONTACT_NOTICE=You want to delete contact data. This data could be still linked with other data which could lead to errors. Please delete only, if you are sure that no foreign data links to this record. ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least gender, first name and family name. +ERROR_CUSTOMER_ID_NOT_FOUND=Error: Customer entry not found. diff --git a/web/WEB-INF/templates/generic/user_profile_link.tpl b/web/WEB-INF/templates/generic/user_profile_link.tpl new file mode 100644 index 00000000..26fe3516 --- /dev/null +++ b/web/WEB-INF/templates/generic/user_profile_link.tpl @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/web/admin/customer/admin_customer_edit.xhtml b/web/admin/customer/admin_customer_edit.xhtml index e70fe72d..3bd118ae 100644 --- a/web/admin/customer/admin_customer_edit.xhtml +++ b/web/admin/customer/admin_customer_edit.xhtml @@ -21,7 +21,28 @@ - Here goes your content. + + + +
+
+ #{msg.ADMIN_EDIT_CUSTOMER_TITLE} +
+ +
+ #{msg.ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE} +
+ + + + + +
+ + +
+
+ -- 2.39.5