From b317c8b6e389530aff96b673baa173e3097ad39b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 20 Aug 2017 14:00:21 +0200 Subject: [PATCH] Please cherry-pick: - re-added (huh? was somehow lost?) user data form with user name and password - moved notice from user (old place) to contact ("new" place) as it was previously double and in user obsolete, let all contacts have at least one email address - renamed i18n string accordingly (naming-convention) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../org/mxchange/localization/bundle_de_DE.properties | 2 +- .../org/mxchange/localization/bundle_en_US.properties | 2 +- .../templates/admin/contact/admin_form_contact_data.tpl | 8 ++++++++ web/WEB-INF/templates/admin/user/admin_form_user_data.tpl | 6 +----- .../admin/user/admin_form_user_personal_data.tpl | 4 ++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 977c879c..b0771ccb 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -260,7 +260,7 @@ ADMIN_PERSONAL_DATA_ENTER_USER_NAME=Benutzername (*1): ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS=Email-Adresse (*2): ADMIN_USER_DATA_USER_NAME_NOTICE=*1: Der Benutzername darf nur einmal vorhanden sein, das System pr\u00fcft dies f\u00fcr Sie. ADMIN_USER_DATA_PASSWORD_ADD_NOTICE=Lassen Sie beide Passwortfelder leer und es wird ein Passwort per Zufall generiert. Das Passwort wird dem Benutzer nach Erstellung des Zugangs an die Email-Adresse gesendet. -ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE=*2: Die Email-Adresse darf nur einmal vorhanden sein. +ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE=*2: Die Email-Adresse darf nur einmal vorhanden sein. BUTTON_ADMIN_ADD_USER=Neues Benutzeraccount hinzuf\u00fcgen ADMIN_MENU_COUNTRY_TITLE=L\u00e4nderdaten LINK_ADMIN_LIST_COUNTRIES=L\u00e4nder auflisten diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index e748e486..0337ae23 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -242,7 +242,7 @@ ADMIN_PERSONAL_DATA_ENTER_USER_NAME=User name (*1): ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS=Email address (*2): ADMIN_USER_DATA_USER_NAME_NOTICE=*1: The user name must be unique which is checked by the system for you. ADMIN_USER_DATA_PASSWORD_ADD_NOTICE=Keep both password fields empty to create a random password. The password is being sent to the user's email address after creation of the account. -ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE=*2: The email address must be unique. +ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE=*2: The email address must be unique. BUTTON_ADMIN_ADD_USER=Add new user account ADMIN_MENU_COUNTRY_TITLE=Country data LINK_ADMIN_LIST_COUNTRIES=List countries diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl index ce141485..8ee9b405 100644 --- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl @@ -292,4 +292,12 @@ + +
+
    +
  • + +
  • +
+
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl index e91047b4..74042e47 100644 --- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl +++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl @@ -68,7 +68,7 @@
- +
@@ -79,10 +79,6 @@ - -
  • - -
  • 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 8b47c6f8..9628451e 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 @@ -5,6 +5,10 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> + + + +
    -- 2.39.5