From cc25b6bccf754cb124f1432d7821b066dd7e8bec 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 | 112 +++++++++--------- .../localization/bundle_de_DE.properties | 12 +- .../localization/bundle_en_US.properties | 12 +- web/WEB-INF/faces-config.xml | 4 +- web/WEB-INF/templates/guest/guest_menu.tpl | 14 +++ web/admin/user/admin_user_list.xhtml | 2 +- 6 files changed, 98 insertions(+), 58 deletions(-) diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 60dd8052..dd284e9b 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,59 +2,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 5d6be3e1..7f1e441d 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -454,4 +454,14 @@ 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. +LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten +LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden. +CONTACT_IS_USER=Ist Benutzer +GUEST_AGREE_READ_PRIVACY_STATEMENT_1=Ja, ich habe die +GUEST_AGREE_READ_PRIVACY_STATEMENT_2=gelesen und auch verstanden und nehme sie hiermit an. +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 +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 89bb140e..0f0482ea 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -432,4 +432,14 @@ 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. +LINK_ADMIN_LIST_CONTACT=List contact data +LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created. +CONTACT_IS_USER=Is a user +GUEST_AGREE_READ_PRIVACY_STATEMENT_1=Yes, I have read and understand the +GUEST_AGREE_READ_PRIVACY_STATEMENT_2=and I accept them with this. +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 2da1c597..6cdc5ca9 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -95,8 +95,8 @@ /user/login_index.xhtml - login_index - /user/index.xhtml + login_user + /user/login_index.xhtml diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index f3f2fb2a..9035cdde 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -15,11 +15,22 @@
    • +
    • +
    + #{msg.MENU_RECRUIITER_TITLE} +
    + +
      +
    • + +
      • +
    +
    #{msg.MENU_USER_TITLE}
    @@ -28,12 +39,15 @@
    • +
    • +
    • +
    • diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 3588c9c3..c6948e68 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -88,7 +88,7 @@
    - +
    -- 2.39.5