]> git.mxchange.org Git - addressbook-war.git/commitdiff
more stuff cleaned up + added missing files
authorRoland Haeder <roland@mxchange.org>
Mon, 5 Oct 2015 11:37:15 +0000 (13:37 +0200)
committerRoland Haeder <roland@mxchange.org>
Mon, 5 Oct 2015 11:37:15 +0000 (13:37 +0200)
Signed-off-by:Roland Häder <roland@mxchange.org>

17 files changed:
nbproject/faces-config.NavData [new file with mode: 0644]
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/beans.xml [new file with mode: 0644]
web/WEB-INF/faces-config.xml [new file with mode: 0644]
web/WEB-INF/glassfish-web.xml [new file with mode: 0644]
web/WEB-INF/templates/base.tpl
web/WEB-INF/templates/generic/gender_selection_box.tpl
web/WEB-INF/templates/guest/guest_base.tpl
web/WEB-INF/templates/guest/guest_personal_data.tpl
web/WEB-INF/templates/guest/guest_registration_form.tpl
web/WEB-INF/web.xml
web/index.xhtml
web/resources/css/cssLayout.css
web/user/login.xhtml [new file with mode: 0644]
web/user/lost_passwd.xhtml [new file with mode: 0644]
web/user/register.xhtml [new file with mode: 0644]

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
new file mode 100644 (file)
index 0000000..e69de29
index 076fb18b59a06e8fae82d75a1767c5495fe8b4e2..e5ffb45e9772fe35ade799854dfca7f94971f89b 100644 (file)
@@ -20,8 +20,7 @@ GENDER_FEMALE=Frau
 YES=Ja
 NO=Nein
 PAGE_TITLE_INDEX_WELCOME=Willkommen!
-SUB_TITLE_INDEX_WELCOME=Willkommen zum Pizza-Service:
-LINK_TO_BASKET_TITLE=Weiter zum Warenkorb.
+SUB_TITLE_INDEX_WELCOME=Willkommen zum Addressbook:
 PAGE_TITLE_ADMIN_WELCOME=Willkommen zum Administrationsbereich
 SUB_TITLE_ADMIN_WELCOME=Willkommen zur Administration:
 PAGE_TITLE_ADMIN_LOGOUT=Ausloggen
@@ -31,26 +30,25 @@ BUTTON_RESET_FORM=Formular zur\u00fccksetzen
 ADMIN_BUTTON_EDIT_ENTRIES=\u00c4ndern
 ADMIN_BUTTON_DELETE_ENTRIES=L\u00f6schen
 PLEASE_FILL_ALL_FIELDS=Bitte alle Felder ausf\u00fcllen:
-GUEST_ENTER_LOGIN_DATA_TITLE=Bitte geben Sie Ihre Kundennummer und Passwort ein:
-GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie die Ihnen vergebene Kundennummer und das dazugeh\u00f6rige Passwort ein.
+GUEST_ENTER_LOGIN_DATA_TITLE=Bitte geben Sie Ihrem Benutzernamen und Passwort ein:
+GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie Ihren Benutzernamen und das dazugeh\u00f6rige Passwort ein.
 GUEST_ENTER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben:
 ENTER_PASSWORD=Passwort:
 LINK_GUEST_HOME_TITLE=Eingangsseite
 LINK_GUEST_HOME=Home
 LINK_CLOSE_SESSION_TITLE=Sitzung beennden
 LINK_CLOSE_SESSION=Sitzung beenden
-MENU_HOME_TITLE=Shop
-LINK_GUEST_LOGIN_TITLE=Login f\u00fcr bestehende Kunden
+MENU_HOME_TITLE=Home
+LINK_GUEST_LOGIN_TITLE=Login f\u00fcr bestehende Benutzer
 LINK_GUEST_LOGIN=Einloggen
-LINK_GUEST_REGISTER_TITLE=Anmeldung als neuer Kunde
-LINK_GUEST_REGISTER=Neuer Kunde
+LINK_GUEST_REGISTER_TITLE=Anmeldung als neuer Benutzer
+LINK_GUEST_REGISTER=Neuer Benutzer
 LINK_GUEST_PASSWORD_TITLE=Neues Passwort erstellen
 LINK_GUEST_PASSWORD=Passwort vergessen?
-LINK_TO_BASKET=Zum Warenkorb
 PAGE_TITLE_INDEX_IMPRINT=Impressum
 SUB_TITLE_INDEX_IMPRINT=Impressum:
 GUEST_REGISTRATION_TITLE=Anmelden als Neukunde
-GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=Zum Best\u00e4tigen wird Ihre Email-Adresse ben\u00f6tigt, f\u00fcr den Login Kundennummer und Passwort.
+GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=Zum Best\u00e4tigen wird Ihre Email-Adresse ben\u00f6tigt, f\u00fcr den Login Benutzername und Passwort.
 GUEST_REGISTRATION_EMAIL_LEGEND=Email-Adresse und Passwort:
 GUEST_REGISTRATION_ENTER_EMAIL1=Email-Adresse eingeben:
 GUEST_REGISTRATION_ENTER_EMAIL2=Email-Adresse wiederholen:
@@ -76,7 +74,7 @@ PERSONAL_DATA_CITY=Ort:
 PERSONAL_DATA_LEGEND_TITLE=Bitte geben Sie Ihre Daten ein.
 PERSONAL_DATA_LEGEND=Bitte Ihre Daten eingeben:
 PAGE_TITLE_USER_LOGIN=Einloggen
-SUB_TITLE_USER_LOGIN=Zum Kundenbereich einloggen:
+SUB_TITLE_USER_LOGIN=Zum Benutzerbereich einloggen:
 PAGE_TITLE_USER_LOST_PASSWORD=Passwort vergessen
 SUB_TITLE_USER_LOST_PASSWORD=Stellen Sie Ihr Passwort wieder her:
 GUEST_LOST_PASSWORD_TITLE=Sie haben Ihr Passwort vergessen?
@@ -85,7 +83,7 @@ GUEST_LOST_PASSWORD_LEGEND=Bitte Daten eingeben:
 ENTER_EMAIL_ADDRESS=Email-Adresse:
 GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... oder ...
 PAGE_TITLE_USER_REGISTER=Neukunde
-SUB_TITLE_USER_REGISTER=Anmelden zum Pizza-Service:
+SUB_TITLE_USER_REGISTER=Anmelden zum Addressbook:
 PAGE_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen
 SUB_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen
 PAGE_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen
@@ -105,3 +103,4 @@ LINK_GUEST_PRIVACY=Datenschutz
 LINK_GUEST_IMPRINT_TITLE=Impressum
 LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen
 LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen
+MENU_USER_TITLE=Benutzer
index e2614eefc01a30c609c9e85dd608c4b501ff1be1..ce6c596584e3acf643973875fafe3f99f533e839 100644 (file)
@@ -20,8 +20,7 @@ GENDER_FEMALE=Mrs.
 YES=Yes
 NO=No
 PAGE_TITLE_INDEX_WELCOME=Welcome!
-SUB_TITLE_INDEX_WELCOME=Welcome to Pizza-Service
-LINK_TO_BASKET_TITLE=Continued to basket page.
+SUB_TITLE_INDEX_WELCOME=Welcome to Addressbook
 PAGE_TITLE_ADMIN_WELCOME=Welcome to administration area
 SUB_TITLE_ADMIN_WELCOME=Welcome to website administration:
 PAGE_TITLE_ADMIN_LOGOUT=Logout
@@ -31,26 +30,25 @@ BUTTON_RESET_FORM=Reset form
 ADMIN_BUTTON_EDIT_ENTRIES=Edit
 ADMIN_BUTTON_DELETE_ENTRIES=Delete
 PLEASE_FILL_ALL_FIELDS=Please fill out all fields:
-GUEST_ENTER_LOGIN_DATA_TITLE=Please enter your customer number and password:
-GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned customer number and password.
+GUEST_ENTER_LOGIN_DATA_TITLE=Please enter your login name and password:
+GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned login name and password.
 GUEST_ENTER_LOGIN_DATA_LEGEND=Please enter your login data:
 ENTER_PASSWORD=Password:
 LINK_GUEST_HOME_TITLE=Home page
 LINK_GUEST_HOME=Home
 LINK_CLOSE_SESSION_TITLE=Close session
 LINK_CLOSE_SESSION=Close session
-MENU_HOME_TITLE=Shop
-LINK_GUEST_LOGIN_TITLE=Login for existing customers
+MENU_HOME_TITLE=Home
+LINK_GUEST_LOGIN_TITLE=Login for existing users
 LINK_GUEST_LOGIN=Login
-LINK_GUEST_REGISTER_TITLE=Registration for new customer
+LINK_GUEST_REGISTER_TITLE=Registration for new user
 LINK_GUEST_REGISTER=Registration
 LINK_GUEST_PASSWORD_TITLE=Create new password
 LINK_GUEST_PASSWORD=Lost password?
-LINK_TO_BASKET=To basket
 PAGE_TITLE_INDEX_IMPRINT=Imprint
 SUB_TITLE_INDEX_IMPRINT=Imprint:
-GUEST_REGISTRATION_TITLE=Register a new customer account
-GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=For account confirmation your email address is required. For logins your customer number and password are required.
+GUEST_REGISTRATION_TITLE=Register a new user account
+GUEST_REGISTRATION_EMAIL_LEGEND_TITLE=For account confirmation your email address is required. For logins your login name and password are required.
 GUEST_REGISTRATION_EMAIL_LEGEND=Email address and password:
 GUEST_REGISTRATION_ENTER_EMAIL1=Enter your email address:
 GUEST_REGISTRATION_ENTER_EMAIL2=Repeat your email address:
@@ -76,7 +74,7 @@ PERSONAL_DATA_CITY=City:
 PERSONAL_DATA_LEGEND_TITLE=Please enter your data.
 PERSONAL_DATA_LEGEND=Please enter your data:
 PAGE_TITLE_USER_LOGIN=Login
-SUB_TITLE_USER_LOGIN=Login to customer area:
+SUB_TITLE_USER_LOGIN=Login to user area:
 PAGE_TITLE_USER_LOST_PASSWORD=Lost password
 SUB_TITLE_USER_LOST_PASSWORD=Recover your password:
 GUEST_LOST_PASSWORD_TITLE=Have you forgotten your password?
@@ -85,7 +83,7 @@ GUEST_LOST_PASSWORD_LEGEND=Please enter your data:
 ENTER_EMAIL_ADDRESS=Email address:
 GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL=... or ...
 PAGE_TITLE_USER_REGISTER=Register
-SUB_TITLE_USER_REGISTER=Register at Pizza-Service:
+SUB_TITLE_USER_REGISTER=Register at Addressbook:
 PAGE_TITLE_INDEX_TERMS=Terms & Conditions
 SUB_TITLE_INDEX_TERMS=Terms & Conditions
 PAGE_TITLE_INDEX_PRIVACY=Privacy
@@ -105,3 +103,4 @@ LINK_GUEST_PRIVACY=Datenschutz
 LINK_GUEST_IMPRINT_TITLE=Impressum
 LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen
 LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen
+MENU_USER_TITLE=User
diff --git a/web/WEB-INF/beans.xml b/web/WEB-INF/beans.xml
new file mode 100644 (file)
index 0000000..0f4e2aa
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+          bean-discovery-mode="all">
+</beans>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
new file mode 100644 (file)
index 0000000..92ee786
--- /dev/null
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<faces-config version="2.2"
+                         xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+       <validator>
+               <validator-id>PrivacyTermsCheckboxValidator</validator-id>
+               <validator-class>org.mxchange.jcoreee.validator.bool.privacy_terms.PrivacyTermsCheckboxValidator</validator-class>
+       </validator>
+       <validator>
+               <validator-id>NameValidator</validator-id>
+               <validator-class>org.mxchange.jcoreee.validator.string.names.NameValidator</validator-class>
+       </validator>
+       <navigation-rule>
+               <from-view-id>*</from-view-id>
+               <navigation-case>
+                       <from-outcome>user_register</from-outcome>
+                       <to-view-id>/user/register.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>index</from-outcome>
+                       <to-view-id>/index.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_lost_passwd</from-outcome>
+                       <to-view-id>/user/lost_passwd.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_login</from-outcome>
+                       <to-view-id>/user/login.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>terms</from-outcome>
+                       <to-view-id>/terms.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>privacy</from-outcome>
+                       <to-view-id>/privacy.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>imprint</from-outcome>
+                       <to-view-id>/imprint.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>logout</from-outcome>
+                       <to-view-id>/bye.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_product</from-outcome>
+                       <to-view-id>/admin/product.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_category</from-outcome>
+                       <to-view-id>/admin/category.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_index</from-outcome>
+                       <to-view-id>/admin/index.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/admin_logout.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>index</from-outcome>
+                       <to-view-id>/*</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <application>
+               <locale-config>
+                       <default-locale>de</default-locale>
+                       <supported-locale>en_US</supported-locale>
+               </locale-config>
+       </application>
+</faces-config>
diff --git a/web/WEB-INF/glassfish-web.xml b/web/WEB-INF/glassfish-web.xml
new file mode 100644 (file)
index 0000000..80dc080
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
+<glassfish-web-app error-url="">
+  <context-root>/addressbook-war</context-root>
+  <class-loader delegate="true"/>
+  <jsp-config>
+    <property name="keepgenerated" value="true">
+      <description>Keep a copy of the generated servlet class' java code.</description>
+    </property>
+  </jsp-config>
+</glassfish-web-app>
index e95a770dcfa512f23f37d0c2d58d6dbbd840baad..a8f8d63cfc761c67fe0a2e521c07bf7339ca5c01 100644 (file)
                <div id="top">
                        <div id="header"> 
                                <div id="title">
-                                       <h1>Pizza-Service - <ui:insert name="title">Default title</ui:insert></h1>
+                                       <h1>Addressbook - <ui:insert name="title">Default title</ui:insert></h1>
                                </div>
                        </div>
                </div>
 
-               <!--
-               Mini basket on left side
-               //-->
-               <div id="mini_basket">
-                       <ui:insert name="basket" />
-               </div>
-
                <div id="menu_content">
                        <div id="left">
                                <ui:insert name="menu">Default menu</ui:insert>
index 422ace8d49e56c9dbe349f356757c1b5a66c7725..43cde46729b959717127c7f9cfafac82e0ef8ced 100644 (file)
@@ -5,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
-       <h:selectOneMenu class="select" id="gender" value="#{customerController.gender}">
+       <h:selectOneMenu class="select" id="gender" value="#{userController.gender}">
                <f:selectItems value="#{gender.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />
        </h:selectOneMenu>
 </ui:composition>
index 7b8ebca624048398825684bed34cf5a07d0cf0fc..a238e0505ee353c62f90685366ecc5d3b295bdc9 100644 (file)
@@ -5,19 +5,4 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
        <ui:define name="title"><ui:insert name="guest_title" class="guest_title" /></ui:define>
-
-       <!--
-       Show basket if it contains items, else show an empty basket.
-       //-->
-       <ui:define name="basket">
-               <ui:fragment rendered="#{basketController.isEmpty()}">
-                       <!-- Empty basket //-->
-                       <ui:include src="/WEB-INF/templates/basket/mini_basket_empty.tpl" />
-               </ui:fragment>
-
-               <ui:fragment rendered="#{basketController.hasItems()}">
-                       <!-- At least one item is there //-->
-                       <ui:include src="/WEB-INF/templates/basket/mini_basket.tpl" />
-               </ui:fragment>
-       </ui:define>
 </ui:composition>
index 7c780dd32cdad63e2ddf1d1b1f4ade396690e608..f5571468e4dbf6e6d43c12c9fe9551297faa60a2 100644 (file)
@@ -31,7 +31,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="companyname" size="15" maxlength="255" value="#{customerController.companyName}" />
+                                       <h:inputText class="input" id="companyname" size="15" maxlength="255" value="#{userController.companyName}" />
                                </div>
 
                                <div class="clear"></div>
@@ -43,7 +43,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{customerController.firstName}" required="true">
+                                       <h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{userController.firstName}" required="true">
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
@@ -57,7 +57,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{customerController.familyName}" required="true">
+                                       <h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{userController.familyName}" required="true">
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
@@ -71,7 +71,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{customerController.street}" required="true">
+                                       <h:inputText class="input" id="street" size="20" maxlength="255" value="#{userController.street}" required="true">
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
@@ -85,7 +85,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{customerController.houseNumber}" required="true">
+                                       <h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{userController.houseNumber}" required="true">
                                                <f:validateLongRange minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
@@ -99,7 +99,7 @@
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{customerController.zipCode}" required="true" />
+                                       <h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{userController.zipCode}" required="true" />
                                </div>
 
                                <div class="clear"></div>
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{customerController.city}" required="true">
+                                       <h:inputText class="input" id="city" size="10" maxlength="255" value="#{userController.city}" required="true">
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="phoneNumber" size="20" maxlength="255" value="#{customerController.phoneNumber}" />
+                                       <h:inputText class="input" id="phoneNumber" size="20" maxlength="255" value="#{userController.phoneNumber}" />
                                </div>
 
                                <div class="clear"></div>
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="faxNumber" size="20" maxlength="255" value="#{customerController.faxNumber}" />
+                                       <h:inputText class="input" id="faxNumber" size="20" maxlength="255" value="#{userController.faxNumber}" />
                                </div>
 
                                <div class="clear"></div>
                                </div>
 
                                <div class="table_right">
-                                       <h:inputText class="input" id="cellphoneNumber" size="20" maxlength="255" value="#{customerController.cellphoneNumber}" />
+                                       <h:inputText class="input" id="cellphoneNumber" size="20" maxlength="255" value="#{userController.cellphoneNumber}" />
                                </div>
 
                                <div class="clear"></div>
index 56a523204aa4f4f1861df91d440fa878bc5d39e2..7c33d24e9d2da7e451389aadc9a905209f34af03 100644 (file)
@@ -24,7 +24,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{customerController.emailAddress}" required="true" />
+                                                       <h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{userController.emailAddress}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
@@ -36,7 +36,7 @@
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{customerController.emailAddress}" required="true" />
+                                                       <h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{userController.emailAddress}" required="true" />
                                                </div>
 
                                                <div class="clear"></div>
index c5e7c7381b8565920988ba7607cf0d319cb2eb37..d256d2a33a4c7d2b4c2f17dee41d883f136b73f8 100644 (file)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
-    <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
-        <param-value>Development</param-value>
-    </context-param>
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>/faces/*</url-pattern>
-    </servlet-mapping>
-    <session-config>
-        <session-timeout>
-            30
-        </session-timeout>
-    </session-config>
-    <welcome-file-list>
-        <welcome-file>faces/index.xhtml</welcome-file>
-    </welcome-file-list>
+       <context-param>
+               <param-name>javax.faces.PROJECT_STAGE</param-name>
+               <param-value>Development</param-value>
+       </context-param>
+       <servlet>
+               <servlet-name>Faces Servlet</servlet-name>
+               <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+               <load-on-startup>1</load-on-startup>
+       </servlet>
+       <servlet-mapping>
+               <servlet-name>Faces Servlet</servlet-name>
+               <url-pattern>/faces/*</url-pattern>
+       </servlet-mapping>
+       <session-config>
+               <session-timeout>
+                       30
+               </session-timeout>
+       </session-config>
+       <welcome-file-list>
+               <welcome-file>faces/index.xhtml</welcome-file>
+       </welcome-file-list>
 </web-app>
index d459ebfbdc86bcec725f022e6b927ca50dd709b5..ef1bc7e8c91ef23ba40809c1a8eaf6590627ccb7 100644 (file)
@@ -7,11 +7,6 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <!--
-       TODO: Not used:
-       xmlns:basket="http://mxchange.org/jshop/tags/basket"
-       //-->
-
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="title">#{msg.PAGE_TITLE_INDEX_WELCOME}</ui:define>
 
index 321cf6466c916c6e612600b6250354014ac107a3..ca1f6f165bfd07500f796a2fb2411e5a4c339448 100644 (file)
@@ -72,10 +72,6 @@ table, .table {
        width: 500px;
 }
 
-.basket_item_table {
-       width: 600px;
-}
-
 .table_row {
        width: 100%;
        min-height: 20px;
diff --git a/web/user/login.xhtml b/web/user/login.xhtml
new file mode 100644 (file)
index 0000000..c044f10
--- /dev/null
@@ -0,0 +1,40 @@
+<?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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="customer_login">
+               <ui:define name="title">#{msg.PAGE_TITLE_CUSTOMER_LOGIN}</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.SUB_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 id="login_form" class="login_form" 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:define name="footer">
+                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/lost_passwd.xhtml b/web/user/lost_passwd.xhtml
new file mode 100644 (file)
index 0000000..25f95e2
--- /dev/null
@@ -0,0 +1,75 @@
+<?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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+               <ui:define name="title">#{msg.PAGE_TITLE_CUSTOMER_LOST_PASSWORD}</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.SUB_TITLE_CUSTOMER_LOST_PASSWORD}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="para" id="customer_lost_password_content">
+                               <h:form acceptcharset="utf-8" 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_CUSTOMER_NUMBER}" />
+                                                               </div>
+
+                                                               <div class="table_right">
+                                                                       <h:inputText class="input" id="id" size="10" maxlength="20" />
+                                                               </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 class="input" id="email" size="20" maxlength="255" />
+                                                               </div>
+
+                                                               <div class="clear"></div>
+                                                       </div>
+
+                                               </fieldset>
+
+                                               <div class="table_footer">
+                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                                       <h:commandButton class="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwdRecoverController.doLostPasswordStep2()}" />
+                                               </div>
+                                       </div>
+                               </h:form>
+                       </div>
+               </ui:define>
+
+               <ui:define name="footer">
+                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/register.xhtml b/web/user/register.xhtml
new file mode 100644 (file)
index 0000000..2d91ead
--- /dev/null
@@ -0,0 +1,35 @@
+<?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 xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+               <ui:define name="title">#{msg.PAGE_TITLE_CUSTOMER_REGISTER}</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.SUB_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:define name="footer">
+                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+               </ui:define>
+       </ui:composition>
+</html>