From e860099d2abf14549c490920d0cb7946c2113694 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 21 Apr 2016 11:30:51 +0200 Subject: [PATCH] Continued: - template 'admin_form_user_data' requires parameter 'mode'. - added missing i18n strings 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 | 6 +- .../admin/user/admin_form_user_data.tpl | 101 ++++++++++-------- .../user/admin_form_user_personal_data.tpl | 4 +- 4 files changed, 68 insertions(+), 49 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 217b436f..23280e38 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -360,7 +360,7 @@ ADMIN_USER_DATA_EMAIL_LEGEND_TITLE=Vergeben Sie hier den Benutzernamen und geben ADMIN_USER_DATA_ENTER_USER_NAME=Benutzername (*1): ADMIN_USER_DATA_ENTER_EMAIL=Email-Adresse (*2): ADMIN_USER_DATA_USER_NAME_NOTICE=*1: Der Benutzername darf nur einmal vorhanden sein, das System prueft dies fuer Sie. -ADMIN_USER_DATA_PASSWORD_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_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. BUTTON_ADMIN_ADD_USER=Neuen Benutzer hinzuf\u00fcgen ADMIN_MENU_COUNTRY_TITLE=L\u00e4nderdaten @@ -511,3 +511,7 @@ CONTENT_TITLE_ADMIN_EDIT_CONTACT=Kontaktdaten editieren: ADMIN_LINK_EDIT_CONTACT=Kontaktdaten editieren #@TODO Please fix German umlauts! ADMIN_LINK_EDIT_CONTACT_TITLE=Hier k\u00f6nnen Sie die Kontaktdaten editieren. +BUTTON_ADMIN_EDIT_USER=Benutzerdaten \u00e4ndern +ADMIN_EDIT_USER_TITLE=Benutzerdaten editieren +ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE=Wenn Sie das Passwort \u00e4ndern wollen, m\u00fcssen Sie es zweimal eingeben, anderfalls beide leer lassen. +ERROR_PARAMETER_MODE_NOT_SET=Fehler: Parameter 'modus' nicht gesetzt. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 0aa276b1..85bd6410 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -334,7 +334,7 @@ ADMIN_USER_DATA_EMAIL_LEGEND_TITLE=Enter here a user name and email address. ADMIN_USER_DATA_ENTER_USER_NAME=User name (*1): ADMIN_USER_DATA_ENTER_EMAIL=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_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_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. BUTTON_ADMIN_ADD_USER=Add new user account ADMIN_MENU_COUNTRY_TITLE=Country data @@ -485,3 +485,7 @@ PAGE_TITLE_ADMIN_EDIT_CONTACT=Edit contact data CONTENT_TITLE_ADMIN_EDIT_CONTACT=Edit contact data: ADMIN_LINK_EDIT_CONTACT=Edit contact data ADMIN_LINK_EDIT_CONTACT_TITLE=Here you can edit contact data. +BUTTON_ADMIN_EDIT_USER=Change user data +ADMIN_EDIT_USER_TITLE=Edit user data +ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE=If you want to change the password, enter it twice, otherwise leave both empty. +ERROR_PARAMETER_MODE_NOT_SET=Error: Parameter 'modus' is not set. 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 589fa1e1..d96ee2ef 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 @@ -5,67 +5,76 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> -
-
- #{msg.ADMIN_USER_DATA_EMAIL_LEGEND} + -
-
- -
+ +
+
+ #{msg.ADMIN_USER_DATA_EMAIL_LEGEND} -
- -
+
+
+ +
-
-
+
+ +
-
-
- +
-
- +
+
+ +
+ +
+ +
+ +
-
-
+
-
+
+
+ +
-
-
- -
+
+ +
-
- +
-
-
+
+
+ +
-
-
- -
+
+ +
-
- +
-
-
- -
-
    -
  • #{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}
    • -
  • #{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}
    • -
  • #{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_NOTICE}
    • -
-
-
-
+
+
    +
  • #{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}
    • + +
  • + + +
    • + +
  • #{msg.ADMIN_USER_DATA_EMAIL_ADDRESS_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 2ad070f8..b6a1bd1d 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 @@ -11,5 +11,7 @@ - + + + -- 2.39.5