From b8e8cd6acd4000bfaac6b155008e93f420355f58 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 10 Apr 2016 21:02:40 +0200 Subject: [PATCH] Continued with administrative area: - added admin_form_personal_data.xhtml which is based on the generic but with some things different - added a lot new language strings --- .../localization/bundle_de_DE.properties | 29 +++ .../localization/bundle_en_US.properties | 24 ++ .../admin/admin_form_personal_data.tpl | 234 ++++++++++++++++++ web/admin/admin_user_add.xhtml | 15 +- 4 files changed, 301 insertions(+), 1 deletion(-) create mode 100644 web/WEB-INF/templates/admin/admin_form_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 8bcb93de..8f8c7a57 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -263,3 +263,32 @@ CONTENT_TITLE_ADMIN_EDIT_PRODUCT=Produkt aendern: ADMIN_LINK_EDIT_DELETE_CATEGORY_TITLE=Aendern oder loeschen der Kategorie #@TODO Please fix German umlauts! ADMIN_LINK_EDIT_DELETE_PRODUCT_TITLE=Aendern oder loeschen des Produktes +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. +#@TODO Please fix German umlauts! +ADMIN_PERSONAL_DATA_LEGEND=Persoenliche Daten des Benutzers: +#@TODO Please fix German umlauts! +ADMIN_PERSONAL_DATA_LEGEND_TITLE=Geben Sie hier die persoenlichen Daten des neuen Benutzers ein. +#@TODO Please fix German umlauts! +ADMIN_PERSONAL_DATA_GENDER=Anrede auswaehlen: +ADMIN_PERSONAL_DATA_FIRST_NAME=Vorname: +ADMIN_PERSONAL_DATA_FAMILY_NAME=Familienname: +ADMIN_PERSONAL_DATA_STREET=Strassenname: +ADMIN_PERSONAL_DATA_HOUSE_NUMBER=Hausnummer: +ADMIN_PERSONAL_DATA_ZIP_CODE=Postleitzahl: +ADMIN_PERSONAL_DATA_CITY=Wohnort: +#@TODO Please fix German umlauts! +ADMIN_PERSONAL_DATA_COUNTRY_CODE=Land auswaehlen: +ADMIN_PERSONAL_DATA_PHONE_NUMBER=Telefonnummer: +ADMIN_PERSONAL_DATA_FAX_NUMBER=Faxnummer: +ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER=Handynummer: +ADMIN_ADD_USER_EMAIL_LEGEND=Benutzernamen und Email-Adresse: +ADMIN_ADD_USER_EMAIL_LEGEND_TITLE=Vergeben Sie hier den Benutzernamen und geben Sie die Email-Adresse ein. +ADMIN_ADD_USER_ENTER_USER_NAME=Benutzername (*1): +ADMIN_ADD_USER_ENTER_EMAIL=Email-Adresse (*2): +ADMIN_ADD_USER_USER_NAME_NOTICE=*1: Der Benutzername darf nur einmal vorhanden sein, das System prueft dies fuer Sie. +ADMIN_ADD_USER_PASSWORD_NOTICE=Das Passwort wird dem Benutzer nach Erstellung des Zugangs an die Email-Adresse gesendet. +ADMIN_ADD_USER_EMAIL_ADDRESS_NOTICE=*2: Die Email-Adresse darf nur einmal vorhanden sein. +ADMIN_ADD_USER_CUSTOMER_NUMBER_NOTICE=Eine Kundennummer wird automatisch beim Erstellen des Accounts erzeugt. +#@TODO Please fix German umlauts! +BUTTON_ADMIN_ADD_USER=Neuen Benutzer hinzufuegen diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 7e59c0a7..3415868b 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -247,3 +247,27 @@ PAGE_TITLE_ADMIN_EDIT_PRODUCT=Edit product CONTENT_TITLE_ADMIN_EDIT_PRODUCT=Edit product: ADMIN_LINK_EDIT_DELETE_CATEGORY_TITLE=Edit or delete category ADMIN_LINK_EDIT_DELETE_PRODUCT_TITLE=Edit or delete product +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_PERSONAL_DATA_LEGEND=Personal data of the user: +ADMIN_PERSONAL_DATA_LEGEND_TITLE=Here you can enter the personal data of the new user. +ADMIN_PERSONAL_DATA_GENDER=Select gender: +ADMIN_PERSONAL_DATA_FIRST_NAME=First name: +ADMIN_PERSONAL_DATA_FAMILY_NAME=Family name: +ADMIN_PERSONAL_DATA_STREET=Name of street: +ADMIN_PERSONAL_DATA_HOUSE_NUMBER=House number: +ADMIN_PERSONAL_DATA_ZIP_CODE=ZIP code: +ADMIN_PERSONAL_DATA_CITY=City: +ADMIN_PERSONAL_DATA_COUNTRY_CODE=Select country: +ADMIN_PERSONAL_DATA_PHONE_NUMBER=Phone number: +ADMIN_PERSONAL_DATA_FAX_NUMBER=Fax number: +ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER=Mobile number: +ADMIN_ADD_USER_EMAIL_LEGEND=User name and email address: +ADMIN_ADD_USER_EMAIL_LEGEND_TITLE=Enter here a user name and email address. +ADMIN_ADD_USER_ENTER_USER_NAME=User name (*1): +ADMIN_ADD_USER_ENTER_EMAIL=Email address (*2): +ADMIN_ADD_USER_USER_NAME_NOTICE=*1: The user name must be unique which is checked by the system for you. +ADMIN_ADD_USER_PASSWORD_NOTICE=The password is being sent to the user's email address after creation of the account. +ADMIN_ADD_USER_EMAIL_ADDRESS_NOTICE=*2: The email address must be unique. +ADMIN_ADD_USER_CUSTOMER_NUMBER_NOTICE=A customer number is being automatically created on creation of the account. +BUTTON_ADMIN_ADD_USER=Add new user account diff --git a/web/WEB-INF/templates/admin/admin_form_personal_data.tpl b/web/WEB-INF/templates/admin/admin_form_personal_data.tpl new file mode 100644 index 00000000..6c6cc286 --- /dev/null +++ b/web/WEB-INF/templates/admin/admin_form_personal_data.tpl @@ -0,0 +1,234 @@ + + + +
+ #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE} +
+ +
+
+ #{msg.ADMIN_PERSONAL_DATA_LEGEND} + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + + +
+ +
+
+ +
+
+ +
+ +
+ + + + + + + + + + + + +
+ +
+
+ +
+
+ +
+ +
+ + + + + + + + + + + + +
+ +
+
+ +
+
+ +
+ +
+ + + + + + + + +
+ +
+
+
+
+ +
+
+ #{msg.ADMIN_ADD_USER_EMAIL_LEGEND} + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
    +
  • #{msg.ADMIN_ADD_USER_USER_NAME_NOTICE}
    • +
  • #{msg.ADMIN_ADD_USER_PASSWORD_NOTICE}
    • +
  • #{msg.ADMIN_ADD_USER_EMAIL_ADDRESS_NOTICE}
    • +
  • #{msg.ADMIN_ADD_USER_CUSTOMER_NUMBER_NOTICE}
    • +
+
+
+
+ diff --git a/web/admin/admin_user_add.xhtml b/web/admin/admin_user_add.xhtml index dbfd0e00..19e2ddeb 100644 --- a/web/admin/admin_user_add.xhtml +++ b/web/admin/admin_user_add.xhtml @@ -14,7 +14,20 @@ - Here goes your content. +
+ +
+ #{msg.ADMIN_ADD_USER_TITLE} +
+ + + +
+ + +
+ +
-- 2.39.5