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 60dd8052251e5971bd8d26b79eeb65ae512dfbbb..dd284e9b7840f43f4d5e275a144da32187644b2e 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,59 +2,65 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="privacy.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/index.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="login/login_start_sharing_addressbook.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="index.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="*" x="1900" y="300" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="user/login.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="login/login_list_sharing_addressbooks.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="login/login_shared_addressbooks.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="basket.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="exception.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="user/register.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="terms.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="imprint.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="privacy.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="guest/recruiter/login.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="user/index.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="user/login_other_addressbooks.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="user/login_start_sharing_addressbook.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="*" x="1900" y="450" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="guest/user/login_error.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="basket.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="user/login_list_sharing_addressbooks.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="exception.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="terms.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="logout.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="imprint.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="user/login_shared_addressbooks.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="150" y="1350" 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 5d6be3e14bc34c39f9c242f0f6e4c1818c11a9f0..7f1e441da6ae77f75a5996f960675c7f39ddad7a 100644 (file)
--- 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 89bb140e882ba8d8c0dd7f166d8b8683295f9256..0f0482ea70b7b1c2f60e2d4f02e8c7c5020b2675 100644 (file)
--- 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 2da1c597a8fb7ac40d36c0a01cf388b888142b94..6cdc5ca96da676493fb5e33d25435bd049dced76 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -95,8 +95,8 @@
                        <to-view-id>/user/login_index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_index</from-outcome>
-                       <to-view-id>/user/index.xhtml</to-view-id>
+                       <from-outcome>login_user</from-outcome>
+                       <to-view-id>/user/login_index.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <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/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 3588c9c3dcdad9b6e28821e62bc07cb5f4688700..c6948e68b8495bfe7bad78647e10169a95149556 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>