From 04a784972148f754ecfc446bc735860a70191e48 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 10 Apr 2016 17:52:43 +0200
Subject: [PATCH] Continued a bit: - "updated" templates from addressbook
 project - added missing language elements - renamed language string, more
 clear now

---
 .../localization/bundle_de_DE.properties      |  8 ++++++
 .../localization/bundle_en_US.properties      | 15 +++++++++--
 .../templates/guest/guest_login_form.tpl      | 12 ++++-----
 .../templates/guest/guest_privacy_terms.tpl   |  2 +-
 .../guest/guest_registration_form.tpl         | 25 +++++++++++++++----
 5 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 8033ab54..a7d4c93c 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -73,6 +73,11 @@ ADMIN_ADD_PRODUCT_NOTICE_LINE3=Keine Tausendertrenner verwenden, auch keine Leer
 GUEST_ENTER_LOGIN_DATA_TITLE=Bitte geben Sie Ihre Kundennummer und Passwort ein:
 GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie die Ihnen vergebene Kundennummer und das dazugeh\u00f6rige Passwort ein.
 GUEST_ENTER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben:
+ENTER_USER_NAME=Benutzernamen:
+BUTTON_USER_LOGIN=Einloggen
+PERSONAL_DATA_COUNTRY_CODE=L\u00e4ndercode:
+GUEST_REGISTRATION_ENTER_USER_NAME=Benutzernamen eingeben:
+GUEST_REGISTRATION_USER_NAME_NOTICE=Der Benutzername darf nur einmal vorkommen.
 ENTER_CUSTOMER_NUMBER=Kundennummer:
 ENTER_PASSWORD=Passwort:
 BUTTON_CUSTOMER_LOGIN=Zum Kundenbereich einloggen
@@ -110,6 +115,8 @@ CONTENT_TITLE_CUSTOMER_CHECKOUT=Bezahlungsm\u00f6glichkeit ausw\u00e4hlen:
 LINK_CHECKOUT_OPTION_LOGIN=Weiter zum Kundenlogin
 LINK_CHECKOUT_OPTION_REGISTRATION=Weiter zum neuen Kundenkonto anmelden
 LINK_CHECKOUT_OPTION_GUEST=Ohne Anmeldung bezahlen
+PAGE_TITLE_USER_LOST_PASSWORD=Passwort vergessen
+CONTENT_TITLE_USER_LOST_PASSWORD=Stellen Sie Ihr Passwort wieder her:
 BUTTON_COMPLETE_ORDER=Bestellung verbindlich abschicken
 GUEST_REGISTRATION_TITLE=Anmelden als Neukunde
 GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=Zum Best\u00e4tigen wird Ihre Email-Adresse ben\u00f6tigt, f\u00fcr den Login Kundennummer und Passwort.
@@ -120,6 +127,7 @@ GUEST_REGISTRATION_ENTER_PASSWORD1=Passwort eingeben:
 GUEST_REGISTRATION_ENTER_PASSWORD2=Passwort wiederholen:
 GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE=Die Kundennummer wird Ihnen sp\u00e4ter vergeben.
 BUTTON_FINISH_REGISTRATION=Anmelden
+LINK_GUEST_PRIVACY_STATEMENTS=Datenschutzbestimmungen
 PRIVACY_TERMS_LEGEND_TITLE=Bitte die AGBs und Datenschutzbestimmungen lesen und akzeptieren.
 PRIVACY_TERMS_LEGEND=Rechtliches:
 PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Bitte den Datenschutzbestimmungen zustimmen.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index b0c2cf07..3d64482f 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -73,6 +73,11 @@ ADMIN_ADD_PRODUCT_NOTICE_LINE3=Don't use thousand separators, including spaces.
 GUEST_ENTER_LOGIN_DATA_TITLE=Please enter your customer number and password:
 GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned customer number and password.
 GUEST_ENTER_LOGIN_DATA_LEGEND=Please enter your login data:
+PERSONAL_DATA_COUNTRY_CODE=Country code:
+GUEST_REGISTRATION_ENTER_USER_NAME=Enter user name:
+GUEST_REGISTRATION_USER_NAME_NOTICE=The user name must only exist once.
+ENTER_USER_NAME=User name:
+BUTTON_USER_LOGIN=Login
 ENTER_CUSTOMER_NUMBER=Customer number:
 ENTER_PASSWORD=Password:
 BUTTON_CUSTOMER_LOGIN=Login to customer area
@@ -107,6 +112,8 @@ PAGE_TITLE_INDEX_CHECKOUT2=Checkout without login
 CONTENT_TITLE_INDEX_CHECKOUT2=Checkout without login:
 GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE=You can checkout without registration
 CONTENT_TITLE_CUSTOMER_CHECKOUT=Choose checkout option:
+PAGE_TITLE_USER_LOGIN=Login
+CONTENT_TITLE_USER_LOGIN=Login to user area:
 LINK_CHECKOUT_OPTION_LOGIN=Continue to customer login
 LINK_CHECKOUT_OPTION_REGISTRATION=Continue with new customer registration
 LINK_CHECKOUT_OPTION_GUEST=Checkout without registration
@@ -140,8 +147,11 @@ PERSONAL_DATA_LEGEND=Please enter your data:
 GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE=Payment without registration
 PAGE_TITLE_CUSTOMER_LOGIN=Login
 CONTENT_TITLE_CUSTOMER_LOGIN=Login to customer area:
-PAGE_TITLE_CUSTOMER_LOST_PASSWORD=Lost password
-CONTENT_TITLE_CUSTOMER_LOST_PASSWORD=Recover your password:
+PAGE_TITLE_USER_LOST_PASSWORD=Lost password
+CONTENT_TITLE_USER_LOST_PASSWORD=Recover your password:
+GUEST_LOST_PASSWORD_TITLE=Have you forgotten your password?
+GUEST_LOST_PASSWORD_LEGEND_TITLE=Please enter your data:
+GUEST_LOST_PASSWORD_LEGEND=Please enter your data:
 GUEST_LOST_PASSWORD_TITLE=Have you forgotten your password?
 GUEST_LOST_PASSWORD_LEGEND_TITLE=Please enter your data:
 GUEST_LOST_PASSWORD_LEGEND=Please enter your data:
@@ -180,6 +190,7 @@ LINK_GUEST_PRIVACY=Privacy
 LINK_GUEST_IMPRINT_TITLE=Imprint
 LINK_GUEST_TERMS_TITLE=Terms & Conditions
 LINK_GUEST_PRIVACY_TITLE=Privacy declaration
+LINK_GUEST_PRIVACY_STATEMENTS=privacy statements
 TABLE_SUMMARY_FULL_BASKET=This table lists all to the basket added articles with single price, sub total and total price.
 TABLE_SUMMARY_ADMIN_CATEGORY=This table lists all in admin area created article categories.
 TABLE_SUMMARY_SHOW_BASKET=This table lists all to the basket added articles.
diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/guest_login_form.tpl
index 85d0e0d2..985165cf 100644
--- a/web/WEB-INF/templates/guest/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_login_form.tpl
@@ -4,7 +4,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://java.sun.com/jsf/facelets">
-	<div id="customer_login_content">
+	<div id="user_login_content">
 		<h:form id="login_form">
 			<div class="table">
 				<div class="table_header">
@@ -16,11 +16,11 @@
 
 					<div class="table_row">
 						<div class="table_left">
-							<h:outputLabel for="id" value="#{msg.ENTER_CUSTOMER_NUMBER}" />
+							<h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
 						</div>
 
 						<div class="table_right">
-							<h:inputText class="input" id="id" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_CUSTOMER_NUMBER_MESSAGE}" />
+							<h:inputText class="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
 						</div>
 					</div>
 
@@ -28,11 +28,11 @@
 
 					<div class="table_row">
 						<div class="table_left">
-							<h:outputLabel for="password" value="#{msg.ENTER_PASSWORD}" />
+							<h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret class="input" id="password" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+							<h:inputSecret class="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
 						</div>
 					</div>
 
@@ -41,7 +41,7 @@
 
 				<div class="table_footer">
 					<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton class="submit" type="submit" action="#{loginController.doLogin()}" value="#{msg.BUTTON_CUSTOMER_LOGIN}" />
+					<h:commandButton class="submit" type="submit" action="#{loginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
 				</div>
 			</div>
 		</h:form>
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index a582d9ab..aa7ee666 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -18,7 +18,7 @@
 
 				<div class="table_right75">
 					#{msg.GUEST_YES_READ_PRIVACY_STATEMENT_1}
-					<h:link outcome="privacy" target="_blank" value="#{msg.PRIVACY_STATEMENTS}" />
+					<h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
 					#{msg.GUEST_YES_READ_PRIVACY_STATEMENT_2}
 				</div>
 
diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
index 264b4b7d..cafbf930 100644
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl
@@ -18,13 +18,25 @@
 				<fieldset id="login_data">
 					<legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}</legend>
 
+					<div class="table_row">
+						<div class="table_left">
+							<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
+						</div>
+
+						<div class="table_right">
+							<h:inputText class="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+						</div>
+
+						<div class="clear"></div>
+					</div>
+
 					<div class="table_row">
 						<div class="table_left">
 							<h:outputLabel for="emailAddress1" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL1}" />
 						</div>
 
 						<div class="table_right">
-							<h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{customerController.emailAddress}" required="true" />
+							<h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{userController.emailAddress}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -36,7 +48,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{customerController.emailAddress}" required="true" />
+							<h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{userController.emailAddressRepeat}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -50,7 +62,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret class="input" id="password1" size="10" maxlength="255" required="true" />
+							<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -62,14 +74,17 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret class="input" id="password2" size="10" maxlength="255" required="true" />
+							<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
 						</div>
 
 						<div class="clear"></div>
 					</div>
 
 					<div class="para notice">
-						#{msg.GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE}
+						<ul>
+							<li>#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}</li>
+							<li>#{msg.GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE}</li>
+						</ul>
 					</div>
 				</fieldset>
 			</div>
-- 
2.39.2