From d7e7bea37d8e397ece12be6b88f47ae014333c78 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 5 Oct 2015 13:37:15 +0200 Subject: [PATCH] =?utf8?q?more=20stuff=20cleaned=20up=20+=20added=20missin?= =?utf8?q?g=20files=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nbproject/faces-config.NavData | 0 .../localization/bundle_de_DE.properties | 23 +++--- .../localization/bundle_en_US.properties | 23 +++--- web/WEB-INF/beans.xml | 6 ++ web/WEB-INF/faces-config.xml | 74 ++++++++++++++++++ web/WEB-INF/glassfish-web.xml | 11 +++ web/WEB-INF/templates/base.tpl | 9 +-- .../generic/gender_selection_box.tpl | 2 +- web/WEB-INF/templates/guest/guest_base.tpl | 15 ---- .../templates/guest/guest_personal_data.tpl | 20 ++--- .../guest/guest_registration_form.tpl | 4 +- web/WEB-INF/web.xml | 42 +++++------ web/index.xhtml | 5 -- web/resources/css/cssLayout.css | 4 - web/user/login.xhtml | 40 ++++++++++ web/user/lost_passwd.xhtml | 75 +++++++++++++++++++ web/user/register.xhtml | 35 +++++++++ 17 files changed, 298 insertions(+), 90 deletions(-) create mode 100644 nbproject/faces-config.NavData create mode 100644 web/WEB-INF/beans.xml create mode 100644 web/WEB-INF/faces-config.xml create mode 100644 web/WEB-INF/glassfish-web.xml create mode 100644 web/user/login.xhtml create mode 100644 web/user/lost_passwd.xhtml create mode 100644 web/user/register.xhtml diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData new file mode 100644 index 00000000..e69de29b diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 076fb18b..e5ffb45e 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -20,8 +20,7 @@ GENDER_FEMALE=Frau YES=Ja NO=Nein PAGE_TITLE_INDEX_WELCOME=Willkommen! -SUB_TITLE_INDEX_WELCOME=Willkommen zum Pizza-Service: -LINK_TO_BASKET_TITLE=Weiter zum Warenkorb. +SUB_TITLE_INDEX_WELCOME=Willkommen zum Addressbook: PAGE_TITLE_ADMIN_WELCOME=Willkommen zum Administrationsbereich SUB_TITLE_ADMIN_WELCOME=Willkommen zur Administration: PAGE_TITLE_ADMIN_LOGOUT=Ausloggen @@ -31,26 +30,25 @@ BUTTON_RESET_FORM=Formular zur\u00fccksetzen ADMIN_BUTTON_EDIT_ENTRIES=\u00c4ndern ADMIN_BUTTON_DELETE_ENTRIES=L\u00f6schen PLEASE_FILL_ALL_FIELDS=Bitte alle Felder ausf\u00fcllen: -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_TITLE=Bitte geben Sie Ihrem Benutzernamen und Passwort ein: +GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie Ihren Benutzernamen und das dazugeh\u00f6rige Passwort ein. GUEST_ENTER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben: ENTER_PASSWORD=Passwort: LINK_GUEST_HOME_TITLE=Eingangsseite LINK_GUEST_HOME=Home LINK_CLOSE_SESSION_TITLE=Sitzung beennden LINK_CLOSE_SESSION=Sitzung beenden -MENU_HOME_TITLE=Shop -LINK_GUEST_LOGIN_TITLE=Login f\u00fcr bestehende Kunden +MENU_HOME_TITLE=Home +LINK_GUEST_LOGIN_TITLE=Login f\u00fcr bestehende Benutzer LINK_GUEST_LOGIN=Einloggen -LINK_GUEST_REGISTER_TITLE=Anmeldung als neuer Kunde -LINK_GUEST_REGISTER=Neuer Kunde +LINK_GUEST_REGISTER_TITLE=Anmeldung als neuer Benutzer +LINK_GUEST_REGISTER=Neuer Benutzer LINK_GUEST_PASSWORD_TITLE=Neues Passwort erstellen LINK_GUEST_PASSWORD=Passwort vergessen? -LINK_TO_BASKET=Zum Warenkorb PAGE_TITLE_INDEX_IMPRINT=Impressum SUB_TITLE_INDEX_IMPRINT=Impressum: 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. +GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=Zum Best\u00e4tigen wird Ihre Email-Adresse ben\u00f6tigt, f\u00fcr den Login Benutzername und Passwort. GUEST_REGISTRATION_EMAIL_LEGEND=Email-Adresse und Passwort: GUEST_REGISTRATION_ENTER_EMAIL1=Email-Adresse eingeben: GUEST_REGISTRATION_ENTER_EMAIL2=Email-Adresse wiederholen: @@ -76,7 +74,7 @@ PERSONAL_DATA_CITY=Ort: PERSONAL_DATA_LEGEND_TITLE=Bitte geben Sie Ihre Daten ein. PERSONAL_DATA_LEGEND=Bitte Ihre Daten eingeben: PAGE_TITLE_USER_LOGIN=Einloggen -SUB_TITLE_USER_LOGIN=Zum Kundenbereich einloggen: +SUB_TITLE_USER_LOGIN=Zum Benutzerbereich einloggen: PAGE_TITLE_USER_LOST_PASSWORD=Passwort vergessen SUB_TITLE_USER_LOST_PASSWORD=Stellen Sie Ihr Passwort wieder her: GUEST_LOST_PASSWORD_TITLE=Sie haben Ihr Passwort vergessen? @@ -85,7 +83,7 @@ GUEST_LOST_PASSWORD_LEGEND=Bitte Daten eingeben: ENTER_EMAIL_ADDRESS=Email-Adresse: GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... oder ... PAGE_TITLE_USER_REGISTER=Neukunde -SUB_TITLE_USER_REGISTER=Anmelden zum Pizza-Service: +SUB_TITLE_USER_REGISTER=Anmelden zum Addressbook: PAGE_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen SUB_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen PAGE_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen @@ -105,3 +103,4 @@ LINK_GUEST_PRIVACY=Datenschutz LINK_GUEST_IMPRINT_TITLE=Impressum LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen +MENU_USER_TITLE=Benutzer diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index e2614eef..ce6c5965 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -20,8 +20,7 @@ GENDER_FEMALE=Mrs. YES=Yes NO=No PAGE_TITLE_INDEX_WELCOME=Welcome! -SUB_TITLE_INDEX_WELCOME=Welcome to Pizza-Service -LINK_TO_BASKET_TITLE=Continued to basket page. +SUB_TITLE_INDEX_WELCOME=Welcome to Addressbook PAGE_TITLE_ADMIN_WELCOME=Welcome to administration area SUB_TITLE_ADMIN_WELCOME=Welcome to website administration: PAGE_TITLE_ADMIN_LOGOUT=Logout @@ -31,26 +30,25 @@ BUTTON_RESET_FORM=Reset form ADMIN_BUTTON_EDIT_ENTRIES=Edit ADMIN_BUTTON_DELETE_ENTRIES=Delete PLEASE_FILL_ALL_FIELDS=Please fill out all fields: -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_TITLE=Please enter your login name and password: +GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned login name and password. GUEST_ENTER_LOGIN_DATA_LEGEND=Please enter your login data: ENTER_PASSWORD=Password: LINK_GUEST_HOME_TITLE=Home page LINK_GUEST_HOME=Home LINK_CLOSE_SESSION_TITLE=Close session LINK_CLOSE_SESSION=Close session -MENU_HOME_TITLE=Shop -LINK_GUEST_LOGIN_TITLE=Login for existing customers +MENU_HOME_TITLE=Home +LINK_GUEST_LOGIN_TITLE=Login for existing users LINK_GUEST_LOGIN=Login -LINK_GUEST_REGISTER_TITLE=Registration for new customer +LINK_GUEST_REGISTER_TITLE=Registration for new user LINK_GUEST_REGISTER=Registration LINK_GUEST_PASSWORD_TITLE=Create new password LINK_GUEST_PASSWORD=Lost password? -LINK_TO_BASKET=To basket PAGE_TITLE_INDEX_IMPRINT=Imprint SUB_TITLE_INDEX_IMPRINT=Imprint: -GUEST_REGISTRATION_TITLE=Register a new customer account -GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=For account confirmation your email address is required. For logins your customer number and password are required. +GUEST_REGISTRATION_TITLE=Register a new user account +GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=For account confirmation your email address is required. For logins your login name and password are required. GUEST_REGISTRATION_EMAIL_LEGEND=Email address and password: GUEST_REGISTRATION_ENTER_EMAIL1=Enter your email address: GUEST_REGISTRATION_ENTER_EMAIL2=Repeat your email address: @@ -76,7 +74,7 @@ PERSONAL_DATA_CITY=City: PERSONAL_DATA_LEGEND_TITLE=Please enter your data. PERSONAL_DATA_LEGEND=Please enter your data: PAGE_TITLE_USER_LOGIN=Login -SUB_TITLE_USER_LOGIN=Login to customer area: +SUB_TITLE_USER_LOGIN=Login to user area: PAGE_TITLE_USER_LOST_PASSWORD=Lost password SUB_TITLE_USER_LOST_PASSWORD=Recover your password: GUEST_LOST_PASSWORD_TITLE=Have you forgotten your password? @@ -85,7 +83,7 @@ GUEST_LOST_PASSWORD_LEGEND=Please enter your data: ENTER_EMAIL_ADDRESS=Email address: GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... or ... PAGE_TITLE_USER_REGISTER=Register -SUB_TITLE_USER_REGISTER=Register at Pizza-Service: +SUB_TITLE_USER_REGISTER=Register at Addressbook: PAGE_TITLE_INDEX_TERMS=Terms & Conditions SUB_TITLE_INDEX_TERMS=Terms & Conditions PAGE_TITLE_INDEX_PRIVACY=Privacy @@ -105,3 +103,4 @@ LINK_GUEST_PRIVACY=Datenschutz LINK_GUEST_IMPRINT_TITLE=Impressum LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen +MENU_USER_TITLE=User diff --git a/web/WEB-INF/beans.xml b/web/WEB-INF/beans.xml new file mode 100644 index 00000000..0f4e2aab --- /dev/null +++ b/web/WEB-INF/beans.xml @@ -0,0 +1,6 @@ + + + diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml new file mode 100644 index 00000000..92ee7866 --- /dev/null +++ b/web/WEB-INF/faces-config.xml @@ -0,0 +1,74 @@ + + + + PrivacyTermsCheckboxValidator + org.mxchange.jcoreee.validator.bool.privacy_terms.PrivacyTermsCheckboxValidator + + + NameValidator + org.mxchange.jcoreee.validator.string.names.NameValidator + + + * + + user_register + /user/register.xhtml + + + index + /index.xhtml + + + user_lost_passwd + /user/lost_passwd.xhtml + + + user_login + /user/login.xhtml + + + terms + /terms.xhtml + + + privacy + /privacy.xhtml + + + imprint + /imprint.xhtml + + + logout + /bye.xhtml + + + admin_product + /admin/product.xhtml + + + admin_category + /admin/category.xhtml + + + admin_index + /admin/index.xhtml + + + + /admin/admin_logout.xhtml + + index + /* + + + + + de + en_US + + + diff --git a/web/WEB-INF/glassfish-web.xml b/web/WEB-INF/glassfish-web.xml new file mode 100644 index 00000000..80dc0809 --- /dev/null +++ b/web/WEB-INF/glassfish-web.xml @@ -0,0 +1,11 @@ + + + + /addressbook-war + + + + Keep a copy of the generated servlet class' java code. + + + diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index e95a770d..a8f8d63c 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -20,18 +20,11 @@
- -
- -
-
Default menu diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl index 422ace8d..43cde467 100644 --- a/web/WEB-INF/templates/generic/gender_selection_box.tpl +++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index 7b8ebca6..a238e050 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -5,19 +5,4 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> - - - - - - - - - - - - - diff --git a/web/WEB-INF/templates/guest/guest_personal_data.tpl b/web/WEB-INF/templates/guest/guest_personal_data.tpl index 7c780dd3..f5571468 100644 --- a/web/WEB-INF/templates/guest/guest_personal_data.tpl +++ b/web/WEB-INF/templates/guest/guest_personal_data.tpl @@ -31,7 +31,7 @@
- +
@@ -43,7 +43,7 @@
- +
@@ -57,7 +57,7 @@
- +
@@ -71,7 +71,7 @@
- +
@@ -85,7 +85,7 @@
- +
@@ -99,7 +99,7 @@
- +
@@ -111,7 +111,7 @@
- +
@@ -125,7 +125,7 @@
- +
@@ -137,7 +137,7 @@
- +
@@ -149,7 +149,7 @@
- +
diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl index 56a52320..7c33d24e 100644 --- a/web/WEB-INF/templates/guest/guest_registration_form.tpl +++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl @@ -24,7 +24,7 @@
- +
@@ -36,7 +36,7 @@
- +
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index c5e7c738..d256d2a3 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -1,24 +1,24 @@ - - javax.faces.PROJECT_STAGE - Development - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - Faces Servlet - /faces/* - - - - 30 - - - - faces/index.xhtml - + + javax.faces.PROJECT_STAGE + Development + + + Faces Servlet + javax.faces.webapp.FacesServlet + 1 + + + Faces Servlet + /faces/* + + + + 30 + + + + faces/index.xhtml + diff --git a/web/index.xhtml b/web/index.xhtml index d459ebfb..ef1bc7e8 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -7,11 +7,6 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - #{msg.PAGE_TITLE_INDEX_WELCOME} diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index 321cf646..ca1f6f16 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -72,10 +72,6 @@ table, .table { width: 500px; } -.basket_item_table { - width: 600px; -} - .table_row { width: 100%; min-height: 20px; diff --git a/web/user/login.xhtml b/web/user/login.xhtml new file mode 100644 index 00000000..c044f109 --- /dev/null +++ b/web/user/login.xhtml @@ -0,0 +1,40 @@ + + + + + + #{msg.PAGE_TITLE_CUSTOMER_LOGIN} + + + + + + + #{msg.SUB_TITLE_CUSTOMER_LOGIN} + + + +
+ + Noch kein Kunde? Einfach beim Bestellen anmelden oder hier anmelden. +
+ +
+
+ +
+ +
+ + + + + + + diff --git a/web/user/lost_passwd.xhtml b/web/user/lost_passwd.xhtml new file mode 100644 index 00000000..25f95e22 --- /dev/null +++ b/web/user/lost_passwd.xhtml @@ -0,0 +1,75 @@ + + + + + + #{msg.PAGE_TITLE_CUSTOMER_LOST_PASSWORD} + + + + + + + #{msg.SUB_TITLE_CUSTOMER_LOST_PASSWORD} + + + +
+ +
+
+ #{msg.GUEST_LOST_PASSWORD_TITLE} +
+ +
+ #{msg.GUEST_LOST_PASSWORD_LEGEND} + +
+
+ +
+ +
+ +
+ +
+
+ +
+ #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL} +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+ + + + + + + diff --git a/web/user/register.xhtml b/web/user/register.xhtml new file mode 100644 index 00000000..2d91ead4 --- /dev/null +++ b/web/user/register.xhtml @@ -0,0 +1,35 @@ + + + + + + #{msg.PAGE_TITLE_CUSTOMER_REGISTER} + + + + + + + #{msg.SUB_TITLE_CUSTOMER_REGISTER} + + + +
+ Sie sind bereits Kunde? Dann einloggen. +
+ +
+ +
+ + + + + + + -- 2.39.5