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 48acfd5e890f27b863d102d8e194b8d16e9b7cf1..06164247ee89cc15f6a17b09dae104b71dbb136e 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,57 +2,70 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/customer/admin_customer_delete.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="privacy.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.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="400" y="600" zoom="true"/>
-        <Node id="customer/register.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="item_added.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="index.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="customer/login.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="*" x="900" y="750" zoom="true"/>
-        <Node id="admin/customer/admin_customer_unlock.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/customer/admin_customer_edit.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="basket.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="exception.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="terms.xhtml" x="150" y="300" 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="650" y="150" zoom="true"/>
+        <Node id="admin/customer/admin_customer_delete.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="customer/register.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="item_added.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="index.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="*" x="1150" y="600" zoom="true"/>
+        <Node id="customer/login.xhtml" x="900" y="1200" zoom="true"/>
+        <Node id="admin/customer/admin_customer_unlock.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/customer/admin_customer_edit.xhtml" x="650" y="1350" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="basket.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="exception.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="terms.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="900" y="450" zoom="true"/>
         <Node id="admin/user/admin_user_list.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="logout.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="imprint.xhtml" x="1650" y="150" 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="900" y="450" zoom="true"/>
-        <Node id="admin/customer/admin_customer_list.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/customer/admin_customer_show.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="logout.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="imprint.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/customer/admin_customer_list.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="admin/customer/admin_customer_show.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="1900" y="150" 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 13a5475dad5ad5210e56b43ec726195512563939..563a5fb08bbf4ac110f789400bdaaea8381c6981 100644 (file)
--- 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 5829e49d08388ca4e59ee15869de4f1f6889baa1..e3e34ca76e521f699241266d4fa96c45fe31eb48 100644 (file)
--- 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 a0e8134697ee921bb03a59ea58423b27e6986c5c..68b020925168ac7fade5c0496dad673cc6323a7e 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -20,7 +20,7 @@
                        <to-view-id>/index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>customer_lost_passwd</from-outcome>
+                       <from-outcome>user_lost_passwd</from-outcome>
                        <to-view-id>/customer/lost_passwd.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
@@ -92,8 +92,8 @@
                        <to-view-id>/admin/customer/admin_customer_list.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/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 71c84bf603d389e84e7e82741b4ec1e8916d4579..aad3f7b6b0d07916bd04249d066074973636cbf4 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -17,7 +17,7 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.ADMIN_MENU_CUSTOMER_TITLE}
+                               #{msg.ADMIN_MENU_USER_TITLE}
                        </div>
 
                        <ul>

diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index efb4807a333227f2a537215ec3c1a7be80f4e2ca..73bffd59510b8e53ded8d920fb8edf72422ba590 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -15,6 +15,7 @@
                                <li>
                                        <h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
                                </li>
+
                                <li>
                                        <h:link title="#{msg.LINK_TO_BASKET_TITLE}" outcome="basket" value="#{msg.LINK_BASKET}" />
                                </li>
@@ -24,18 +25,20 @@
                        </ul>
 
                        <div class="menu_header">
-                               #{msg.MENU_CUSTOMER_TITLE}
+                               #{msg.MENU_USER_TITLE}
                        </div>
 
                        <ul>
                                <li>
-                                       <h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="customer_login" value="#{msg.LINK_GUEST_LOGIN}" />
+                                       <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="customer_register" value="#{msg.LINK_GUEST_REGISTER}" />
+                                       <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="customer_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" />
+                                       <h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" />
                                </li>
                        </ul>
                </div>

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index d3e1adff32616a6e5d4f8b75c717c39a12b8eab7..76ae94c3cda91adb6d3956e3ff779b2bb7670566 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/customer/login.xhtml b/web/customer/login.xhtml
deleted file mode 100644 (file)
index 831c723..0000000
--- a/web/customer/login.xhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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="customer_login">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_LOGIN}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_CUSTOMER_LOGIN}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="para">
-                               <!-- TODO Internatialize this somehow //-->
-                               Noch kein Kunde? Einfach beim Bestellen anmelden oder <h:link id="customer_register" outcome="customer_register" title="Als Kunde anmelden">hier</h:link> anmelden.
-                       </div>
-
-                       <div class="para">
-                               <ui:include src="/WEB-INF/templates/guest/guest_login_form.tpl" />
-                       </div>
-
-                       <div class="para">
-                               <h:link id="customer_lost_password" outcome="customer_lost_passwd" title="Passwort wiederherstellen" value="Passwort vergessen?" />
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>

diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml
deleted file mode 100644 (file)
index 0d088f3..0000000
--- a/web/customer/lost_passwd.xhtml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="para" id="user_lost_password_content">
-                               <h:form id="lost_password_form">
-                                       <div class="table">
-                                               <div class="table_header">
-                                                       #{msg.GUEST_LOST_PASSWORD_TITLE}
-                                               </div>
-
-                                               <fieldset id="login_data">
-                                                       <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">#{msg.GUEST_LOST_PASSWORD_LEGEND}</legend>
-
-                                                       <div class="table_row">
-                                                               <div class="table_left">
-                                                                       <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
-                                                               </div>
-
-                                                               <div class="table_right">
-                                                                       <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
-                                                               </div>
-
-                                                               <div class="clear"></div>
-                                                       </div>
-
-                                                       <div class="table_header">
-                                                               #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}
-                                                       </div>
-
-                                                       <div class="table_row">
-                                                               <div class="table_left">
-                                                                       <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
-                                                               </div>
-
-                                                               <div class="table_right">
-                                                                       <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
-                                                               </div>
-
-                                                               <div class="clear"></div>
-                                                       </div>
-
-                                               </fieldset>
-
-                                               <div class="table_footer">
-                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
-                                               </div>
-                                       </div>
-                               </h:form>
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>

diff --git a/web/customer/register.xhtml b/web/customer/register.xhtml
deleted file mode 100644 (file)
index 0fece06..0000000
--- a/web/customer/register.xhtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_REGISTER}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_CUSTOMER_REGISTER}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="para">
-                               Sie sind bereits Kunde? Dann <h:link outcome="customer_login" value="hier" /> einloggen.
-                       </div>
-
-                       <div class="registration_form">
-                               <ui:include src="/WEB-INF/templates/guest/guest_registration_form.tpl" />
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>

diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index e52d27906ff338ae9ee0b8d9d76fee2227b2e0fa..90ee53ce7c6aedcfcd7a2138691a35a3993ae55c 100644 (file)
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -3,30 +3,30 @@
 <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"
-         >
+       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="user_login">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="customer_login">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_LOGIN}</ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_USER_LOGIN}
+                       #{msg.CONTENT_TITLE_CUSTOMER_LOGIN}
                </ui:define>
 
                <ui:define name="content">
                        <div class="para">
                                <!-- TODO Internatialize this somehow //-->
-                               Noch kein Benutzerkonto? Einfach <h:link id="user_register" outcome="user_register" title="Als Benutzer anmelden">hier</h:link> anmelden.
+                               Noch kein Kunde? Einfach beim Bestellen anmelden oder <h:link id="customer_register" outcome="customer_register" title="Als Kunde anmelden">hier</h:link> anmelden.
                        </div>
 
                        <div class="para">
-                               <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
+                               <ui:include src="/WEB-INF/templates/guest/guest_login_form.tpl" />
                        </div>
 
                        <div class="para">
-                               <h:link id="user_lost_password" outcome="user_lost_passwd" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
+                               <h:link id="customer_lost_password" outcome="user_lost_passwd" title="Passwort wiederherstellen" value="Passwort vergessen?" />
                        </div>
                </ui:define>
        </ui:composition>

diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
new file mode 100644 (file)
index 0000000..0d088f3
--- /dev/null
+++ b/web/guest/user/lost_passwd.xhtml
@@ -0,0 +1,68 @@
+<?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">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="para" id="user_lost_password_content">
+                               <h:form id="lost_password_form">
+                                       <div class="table">
+                                               <div class="table_header">
+                                                       #{msg.GUEST_LOST_PASSWORD_TITLE}
+                                               </div>
+
+                                               <fieldset id="login_data">
+                                                       <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">#{msg.GUEST_LOST_PASSWORD_LEGEND}</legend>
+
+                                                       <div class="table_row">
+                                                               <div class="table_left">
+                                                                       <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
+                                                               </div>
+
+                                                               <div class="table_right">
+                                                                       <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+                                                               </div>
+
+                                                               <div class="clear"></div>
+                                                       </div>
+
+                                                       <div class="table_header">
+                                                               #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}
+                                                       </div>
+
+                                                       <div class="table_row">
+                                                               <div class="table_left">
+                                                                       <h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
+                                                               </div>
+
+                                                               <div class="table_right">
+                                                                       <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+                                                               </div>
+
+                                                               <div class="clear"></div>
+                                                       </div>
+
+                                               </fieldset>
+
+                                               <div class="table_footer">
+                                                       <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
+                                               </div>
+                                       </div>
+                               </h:form>
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>

diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml
new file mode 100644 (file)
index 0000000..0fece06
--- /dev/null
+++ b/web/guest/user/register.xhtml
@@ -0,0 +1,28 @@
+<?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">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_REGISTER}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_CUSTOMER_REGISTER}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="para">
+                               Sie sind bereits Kunde? Dann <h:link outcome="customer_login" value="hier" /> einloggen.
+                       </div>
+
+                       <div class="registration_form">
+                               <ui:include src="/WEB-INF/templates/guest/guest_registration_form.tpl" />
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>