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

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index f4cc90c5cb34c5af5fe9e7099927d5b6135cc62c..7d96751555d85f100415330985d5b298f29af130 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,60 +2,61 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="privacy.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/index.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="privacy.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/index.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="guest/recruiter/login.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="650" y="450" zoom="true"/>
         <Node id="admin/user/admin_user_unlock.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="index.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="*" x="150" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="guest/user/login_error.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="exception.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="terms.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/admin_user_add.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="logout.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="guest/user/resend_link.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="imprint.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="user/login/login_data_saved.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="*" x="900" y="150" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="guest/user/login_error.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="exception.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="terms.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/admin_user_add.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="logout.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="user/login/login_data_saved.xhtml" x="650" y="300" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index b5a9507731d6f6327b8ef49fda8339aa4ee1bc57..e5bce818ac23cd71b24f9ed455dc9c6ca9b58c91 100644 (file)
--- 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 2a06f495f46e5287375aeebace35eaf714549542..3994dae1200284540d6d592f730a14bb861284fa 100644 (file)
--- 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 ab03d890972551574e5f620513dc8c318780b518..8ed3d59a3eb8a68bac1d1c94b53132d972ef6974 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -110,7 +110,7 @@
        <navigation-rule>
                <from-view-id>/guest/user/login.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>login_index</from-outcome>
+                       <from-outcome>login_user</from-outcome>
                        <to-view-id>/user/login_index.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>

diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index f3f2fb2a80f2436325b38042d615000a996e7d7a..9035cdde6dd93a6a94a4c01e11cf18a5397a8d84 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -15,11 +15,22 @@
                                <li>
                                        <h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
                                </li>
+
                                <li>
                                        <h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
                                </li>
                        </ul>
 
+                       <div class="menu_header">
+                               #{msg.MENU_RECRUIITER_TITLE}
+                       </div>
+
+                       <ul>
+                               <li>
+                                       <h:link title="#{msg.LINK_RERUITER_LOGIN_TITLE}" outcome="recruiter_login" value="#{msg.LINK_RERUITER_LOGIN}" />
+                               </li>
+                       </ul>
+
                        <div class="menu_header">
                                #{msg.MENU_USER_TITLE}
                        </div>
@@ -28,12 +39,15 @@
                                <li>
                                        <h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="user_login" value="#{msg.LINK_GUEST_LOGIN}" />
                                </li>
+
                                <li>
                                        <h:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="user_register" value="#{msg.LINK_GUEST_REGISTER}" />
                                </li>
+
                                <li>
                                        <h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" />
                                </li>
+
                                <li>
                                        <h:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.LINK_GUEST_RESEND_LINK}" />
                                </li>

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 (file)
index 0000000..2c16693
--- /dev/null
+++ b/web/WEB-INF/templates/guest/recruiter/guest_login_form.tpl
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+       <div id="recruiter_login_content">
+               <h:form id="login_form">
+                       <div class="table">
+                               <div class="table_header">
+                                       #{msg.GUEST_ENTER_RECRUITER_LOGIN_DATA_TITLE}
+                               </div>
+
+                               <fieldset id="login_data">
+                                       <legend title="#{msg.GUEST_ENTER_RECRUITER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_RECRUITER_LOGIN_DATA_LEGEND}</legend>
+
+                                       <div class="table_row">
+                                               <div class="table_left">
+                                                       <h:outputLabel for="recruiterName" value="#{msg.ENTER_RECRUITER_NAME}" />
+                                               </div>
+
+                                               <div class="table_right">
+                                                       <h:inputText styleClass="input" id="recruiterName" value="#{recruiterController.recruiterName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_RECRUITER_NAME_MESSAGE}" />
+                                               </div>
+                                       </div>
+
+                                       <div class="clear"></div>
+
+                                       <div class="table_row">
+                                               <div class="table_left">
+                                                       <h:outputLabel for="recruiterPassword" value="#{msg.ENTER_PASSWORD}" />
+                                               </div>
+
+                                               <div class="table_right">
+                                                       <h:inputSecret styleClass="input" id="recruiterPassword" value="#{recruiterController.recruiterPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+                                               </div>
+                                       </div>
+
+                                       <div class="clear"></div>
+                               </fieldset>
+
+                               <div class="table_footer">
+                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton styleClass="submit" type="submit" action="#{recruiterLoginController.doLogin()}" value="#{msg.BUTTON_RECRUITER_LOGIN}" />
+                               </div>
+                       </div>
+               </h:form>
+       </div>
+</ui:composition>

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index a3e5f8aec56eba190a6481ef42e24a63c969275e..b6f7de2aa9567ee9ac7a8592fa7316f56e5418b5 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -88,7 +88,7 @@
                                                                <div class="table_right_medium">
                                                                        <h:selectOneMenu styleClass="select" id="userContact" value="#{adminHelper.contact}" converter="ContactConverter">
                                                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                                                               <f:selectItems value="#{adminUserController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+                                                                               <f:selectItems value="#{userController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
                                                                        </h:selectOneMenu>
                                                                </div>
 

diff --git a/web/guest/recruiter/login.xhtml b/web/guest/recruiter/login.xhtml
new file mode 100644 (file)
index 0000000..5d07b48
--- /dev/null
+++ b/web/guest/recruiter/login.xhtml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+       xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="recruiter_login">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_RECRUITER_LOGIN}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_RECRUITER_LOGIN}
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:include id="login_form" src="/WEB-INF/templates/guest/recruiter/guest_login_form.tpl" />
+               </ui:define>
+       </ui:composition>
+</html>