From dc5da1e818df1e1a79689ed5aba5af036efc9a4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 6 May 2016 10:29:53 +0200 Subject: [PATCH] Continued a bit: - added recruiter login (very lame design, I know) - added navigation rule - added i18n strings - moved back from admin -> regular controller, urgs, it is cached there for a longer time and not just on request MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 113 ++++++++++-------- .../localization/bundle_de_DE.properties | 6 +- .../localization/bundle_en_US.properties | 5 +- web/WEB-INF/faces-config.xml | 6 +- web/WEB-INF/templates/admin/admin_menu.tpl | 2 +- web/WEB-INF/templates/guest/guest_menu.tpl | 11 +- web/admin/user/admin_user_list.xhtml | 2 +- web/customer/login.xhtml | 33 ----- web/guest/user/login.xhtml | 20 ++-- .../user}/lost_passwd.xhtml | 0 web/{customer => guest/user}/register.xhtml | 0 11 files changed, 91 insertions(+), 107 deletions(-) delete mode 100644 web/customer/login.xhtml rename web/{customer => guest/user}/lost_passwd.xhtml (100%) rename web/{customer => guest/user}/register.xhtml (100%) diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 48acfd5e..06164247 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,57 +2,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 13a5475d..563a5fb0 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -348,7 +348,7 @@ PAGE_TITLE_ADMIN_UNLOCK_CUSTOMER=Ent-/Sperren von Kunden CONTENT_TITLE_ADMIN_UNLOCK_CUSTOMER=Ent-/Sperren von Kunden: PAGE_TITLE_ADMIN_SHOW_CUSTOMER=Anzeigen eines Kundens CONTENT_TITLE_ADMIN_SHOW_CUSTOMER=Anzeigen eines Kundens: -ADMIN_MENU_CUSTOMER_TITLE=Kunden +ADMIN_MENU_USER_TITLE=Kunden 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. @@ -407,7 +407,6 @@ ADMIN_DELETE_CONTACT_TITLE=Kontaktdaten unwiederruflich l\u00f6schen BUTTON_ADMIN_DELETE_CONTACT=Kontaktdaten l\u00f6schen ADMIN_DELETE_CONTACT_NOTICE=Sie wollen Kontaktdaten l\u00f6schen. Diese k\u00f6nnten noch evtl. mit anderen Daten verkn\u00fcft sein, was zu Fehlern f\u00fchrt. Bitte l\u00f6schen Sie nur, wenn Sie sich absolut sicher sind, dass keine fremden Daten auf diesen Datensatz mehr verweisen. ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Anrede, Vor- und Nachnamen ein. -ERROR_CUSTOMER_ID_NOT_FOUND=Fehler: Kundeneintrag nicht gefunden. ADMIN_MENU_CONTACT_TITLE=Manage contact data LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden. @@ -418,4 +417,5 @@ GUEST_AGREE_READ_TERMS_CONDITIONS_1=Ja, ich habe die GUEST_AGREE_READ_TERMS_CONDITIONS_2=gelesen und verstanden und nehme sie hiermit an. LINK_GUEST_TERMS_CONDITIONS=Allgemeine Gesch\u00e4ftsbestimmungen LINK_GUEST_PRIVACY_STATEMENTS=Datenschutzbestimmungen -RECRUITER_NOT_LOGGED_IN=Recruiter nicht eingeloggt. +ADMIN_ADD_OR_ENTER_CONTACT_DATA=... oder geben Sie die Kontaktdaten des Recruiters ein: +ADMIN_PERSONAL_DATA_EMAIL_ADDRESS=Email-Adresse: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 5829e49d..e3e34ca7 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -320,7 +320,7 @@ PAGE_TITLE_ADMIN_UNLOCK_CUSTOMER=Un-/Lock customer accounts 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=Customers +ADMIN_MENU_USER_TITLE=Customers 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. @@ -378,7 +378,6 @@ ADMIN_DELETE_CONTACT_TITLE=Delete contact data unreverseable BUTTON_ADMIN_DELETE_CONTACT=Delete contact data ADMIN_DELETE_CONTACT_NOTICE=You want to delete contact data. This data could be still linked with other data which could lead to errors. Please delete only, if you are sure that no foreign data links to this record. ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least gender, first name and family name. -ERROR_CUSTOMER_ID_NOT_FOUND=Error: Customer entry not found. ADMIN_MENU_CONTACT_TITLE=Manage contact data LINK_ADMIN_LIST_CONTACT=List contact data LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created. @@ -389,3 +388,5 @@ GUEST_AGREE_READ_TERMS_CONDITIONS_1=Yes, I have read and understand the GUEST_AGREE_READ_TERMS_CONDITIONS_2=and I accept them with this. LINK_GUEST_TERMS_CONDITIONS=Terms & Conditions LINK_GUEST_PRIVACY_STATEMENTS=privacy statements +ADMIN_ADD_OR_ENTER_CONTACT_DATA=... or enter the recruiter's contact data: +ADMIN_PERSONAL_DATA_EMAIL_ADDRESS=Email address: diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index a0e81346..68b02092 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -20,7 +20,7 @@ /index.xhtml - customer_lost_passwd + user_lost_passwd /customer/lost_passwd.xhtml @@ -92,8 +92,8 @@ /admin/customer/admin_customer_list.xhtml - login_index - /user/index.xhtml + login_user + /user/login_index.xhtml diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index 71c84bf6..aad3f7b6 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -17,7 +17,7 @@
- #{msg.ADMIN_MENU_CUSTOMER_TITLE} + #{msg.ADMIN_MENU_USER_TITLE}
    diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index efb4807a..73bffd59 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -15,6 +15,7 @@
    • +
    • @@ -24,18 +25,20 @@
- #{msg.MENU_CUSTOMER_TITLE} + #{msg.MENU_USER_TITLE}
  • - +
    • +
  • - +
    • +
  • - +
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index d3e1adff..76ae94c3 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -88,7 +88,7 @@
- +
diff --git a/web/customer/login.xhtml b/web/customer/login.xhtml deleted file mode 100644 index 831c723f..00000000 --- a/web/customer/login.xhtml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_CUSTOMER_LOGIN} - - - #{msg.CONTENT_TITLE_CUSTOMER_LOGIN} - - - -
- - Noch kein Kunde? Einfach beim Bestellen anmelden oder hier anmelden. -
- -
- -
- -
- -
- - - diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml index e52d2790..90ee53ce 100644 --- a/web/guest/user/login.xhtml +++ b/web/guest/user/login.xhtml @@ -3,30 +3,30 @@ + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + > - - #{msg.PAGE_TITLE_USER_LOGIN} + + #{msg.PAGE_TITLE_CUSTOMER_LOGIN} - #{msg.CONTENT_TITLE_USER_LOGIN} + #{msg.CONTENT_TITLE_CUSTOMER_LOGIN}
- Noch kein Benutzerkonto? Einfach hier anmelden. + Noch kein Kunde? Einfach beim Bestellen anmelden oder hier anmelden.
- +
- +
diff --git a/web/customer/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml similarity index 100% rename from web/customer/lost_passwd.xhtml rename to web/guest/user/lost_passwd.xhtml diff --git a/web/customer/register.xhtml b/web/guest/user/register.xhtml similarity index 100% rename from web/customer/register.xhtml rename to web/guest/user/register.xhtml -- 2.39.5