Some rewrites:

- use customer's own templates (maybe needs changing, unfinished work)
- fixed some i18n strings + added some missing

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index a5d2b57a522ec1625e7cbbbebca7f4bdd20f8782..47969ef9c13392e2d4529787df73cd3a09955073 100644 (file)
--- 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 19907f0ddc7061da167be944169111642271de78..38b852050612523920611efa2a37edda0e575c41 100644 (file)
--- 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 (file)
index 0000000..f086074
--- /dev/null
+++ b/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <div class="para notice">
+               #{msg.ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE}
+       </div>
+
+       <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
+
+       <!--
+       @TODO Finish this?
+       <ui:include src="/WEB-INF/templates/admin/customer/admin_form_customer_data.tpl">
+               <ui:param name="mode" value="add" />
+       </ui:include>
+       //-->
+</ui:composition>

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 b6a1bd1d68dff5659390be385afe85f4f606f682..13ff590d43e753246d2ab410516b7d4d57404e39 100644 (file)
--- 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">
 
        <div class="para notice">
-               #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
+               #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
        </div>
 
        <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index d2e7ea01ac439696c8848ffad7cdde5735e10ca0..1b92701f98da955fbe964cb449668e148adcb325 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -32,7 +32,7 @@
                                        </div>
 
                                        <div class="para notice">
-                                               #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
+                                               #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">

diff --git a/web/admin/customer/admin_customer_list.xhtml b/web/admin/customer/admin_customer_list.xhtml
index f8d6b7c9b87c2043686cf83eeb829fd6b1200d04..8cd88e59b599679de6f6b18e473d5317b4c988cb 100644 (file)
--- a/web/admin/customer/admin_customer_list.xhtml
+++ b/web/admin/customer/admin_customer_list.xhtml
@@ -73,14 +73,14 @@
                        <div class="table">
                                <h:form id="admin_add_customer">
                                        <div class="table_header">
-                                               #{msg.ADMIN_ADD__CUSTOMER_TITLE}
+                                               #{msg.ADMIN_ADD_CUSTOMER_TITLE}
                                        </div>
 
-                                       <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+                                       <ui:include src="/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl" />
 
                                        <div class="table_footer">
                                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD__CUSTOMER}" action="#{adminCustomerController.addCustomer()}" />
+                                               <h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_CUSTOMER}" action="#{adminCustomerController.addCustomer()}" />
                                        </div>
                                </h:form>
                        </div>

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index a13b4077094ecd81481392c5dd31cccf3ee8a941..da1db9e602da5aeae3502eb4188d7e1bad9e69c3 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -30,7 +30,7 @@
                                        </div>
 
                                        <div class="para notice">
-                                               #{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
+                                               #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">