From 897195d88fe373dfec56f61b0cdd6b325bbf9ef6 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 | 107 +++++++++--------- .../localization/bundle_de_DE.properties | 12 ++ .../localization/bundle_en_US.properties | 12 ++ web/WEB-INF/faces-config.xml | 2 +- web/WEB-INF/templates/guest/guest_menu.tpl | 14 +++ .../guest/recruiter/guest_login_form.tpl | 49 ++++++++ web/admin/user/admin_user_list.xhtml | 2 +- web/guest/recruiter/login.xhtml | 22 ++++ 8 files changed, 165 insertions(+), 55 deletions(-) create mode 100644 web/WEB-INF/templates/guest/recruiter/guest_login_form.tpl create mode 100644 web/guest/recruiter/login.xhtml diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index f4cc90c5..7d967515 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,60 +2,61 @@ - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index b5a95077..e5bce818 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -461,3 +461,15 @@ 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: +MENU_RECRUIITER_TITLE=F\u00fcr Recruiter +LINK_RERUITER_LOGIN=Einloggen +LINK_RERUITER_LOGIN_TITLE=Zum Recruiter-Bereich einloggen +PAGE_TITLE_RECRUITER_LOGIN=Recruiter-Login +CONTENT_TITLE_RECRUITER_LOGIN=Recruiter-Login: +GUEST_ENTER_RECRUITER_LOGIN_DATA_TITLE=Zugangsdaten zum Recruiter-Bereich eingeben +GUEST_ENTER_RECRUITER_LOGIN_DATA_LEGEND=Recruiter-Login und Passwort: +GUEST_ENTER_RECRUITER_LOGIN_DATA_LEGEND_TITLE=Geben Sie hier Ihren vergebenen Recruiter-Loginnamen und das Passwort dazu ein. +ENTER_RECRUITER_NAME=Recruiter-Loginnamen: +BUTTON_RECRUITER_LOGIN=Einloggen +PAGE_TITLE_RECRUITER_INDEX=Indexseite +SUB_TITLE_RECRUITER_INDEX=Willkommen zum Recruiter-Bereich! diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 2a06f495..3994dae1 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -459,3 +459,15 @@ 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: +MENU_RECRUIITER_TITLE=For recruiter +LINK_RERUITER_LOGIN=Login +LINK_RERUITER_LOGIN_TITLE=Login to recruiter area +PAGE_TITLE_RECRUITER_LOGIN=Recruiter login +CONTENT_TITLE_RECRUITER_LOGIN=Recruiter login: +GUEST_ENTER_RECRUITER_LOGIN_DATA_TITLE=Enter recruiter login data +GUEST_ENTER_RECRUITER_LOGIN_DATA_LEGEND=Recruiter login and password: +GUEST_ENTER_RECRUITER_LOGIN_DATA_LEGEND_TITLE=Enter your assigned recruiter login name and password here. +ENTER_RECRUITER_NAME=Recruiter login name: +BUTTON_RECRUITER_LOGIN=Login +PAGE_TITLE_RECRUITER_INDEX=Index page +SUB_TITLE_RECRUITER_INDEX=Welcome to recruiter area! diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index ab03d890..8ed3d59a 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -110,7 +110,7 @@ /guest/user/login.xhtml - login_index + 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/WEB-INF/templates/guest/recruiter/guest_login_form.tpl b/web/WEB-INF/templates/guest/recruiter/guest_login_form.tpl new file mode 100644 index 00000000..2c16693d --- /dev/null +++ b/web/WEB-INF/templates/guest/recruiter/guest_login_form.tpl @@ -0,0 +1,49 @@ + + +
    + +
    +
    + #{msg.GUEST_ENTER_RECRUITER_LOGIN_DATA_TITLE} +
    + +
    + #{msg.GUEST_ENTER_RECRUITER_LOGIN_DATA_LEGEND} + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    + +
    + + +
    +
    +     +
    +     diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index a3e5f8ae..b6f7de2a 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/guest/recruiter/login.xhtml b/web/guest/recruiter/login.xhtml new file mode 100644 index 00000000..5d07b481 --- /dev/null +++ b/web/guest/recruiter/login.xhtml @@ -0,0 +1,22 @@ + + + + + + #{msg.PAGE_TITLE_RECRUITER_LOGIN} + + + #{msg.CONTENT_TITLE_RECRUITER_LOGIN} + + + + + + + -- 2.39.5