From 94975138460e99c05dac20bb1681d586694cfe2c Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 3 Sep 2015 13:38:58 +0200
Subject: [PATCH] =?utf8?q?Refacturing=20towards=20JSF/EJB:=20-=20renamed?=
 =?utf8?q?=20and=20prepared=20JSPs=20to=20XHTML=20(JSF)=20-=20updated=20jc?=
 =?utf8?q?ore,=20jsfcore=20and=20jshop=20-=20added=20own=20validator=20for?=
 =?utf8?q?=20privacy/terms=20checkboxes=20-=20still=20the=20"mini=20basket?=
 =?utf8?q?"=20is=20not=20functional=20yet,=20maybe=20it=20will=20come=20as?=
 =?utf8?q?=20a=20template=3F=20-=20introduced=20guest=5Fbase.tpl=20for=20a?=
 =?utf8?q?ll=20"guest"=20pages=20Signed-off-by:Roland=20H=C3=A4der=20<rola?=
 =?utf8?q?nd@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/jcore.jar                                 | Bin 113190 -> 113150 bytes
 lib/jsfcore.jar                               | Bin 14575 -> 19197 bytes
 lib/jshop.jar                                 | Bin 87804 -> 87592 bytes
 .../application/PizzaServiceApplication.java  |   1 +
 web/WEB-INF/faces-config.xml                  |   4 +
 web/WEB-INF/templates.dist/guest_page.xhtml   |   3 +-
 web/WEB-INF/templates/base.tpl                |  10 +-
 .../generic/gender_selection_box.tpl          |  15 +
 web/WEB-INF/templates/guest/guest_base.tpl    |  13 +
 .../templates/guest/guest_login_form.tpl      |  48 +++
 web/WEB-INF/templates/guest/guest_menu.tpl    |   2 +
 web/WEB-INF/web.xml                           |   3 +
 web/customer/login.jsp                        |  53 ----
 web/customer/login.xhtml                      |  39 +++
 web/customer/lost_passwd.jsp                  |  93 ------
 web/customer/lost_passwd.xhtml                |  75 +++++
 web/customer/register.jsp                     | 291 ------------------
 web/customer/register.xhtml                   | 283 +++++++++++++++++
 web/imprint.xhtml                             |   2 +-
 web/index.xhtml                               |   4 +-
 web/privacy.xhtml                             |   2 +-
 web/resources/css/cssLayout.css               |  11 +-
 web/resources/css/default.css                 |   9 +-
 web/static/forms/form_login.jsp               |  50 ---
 web/static/gender_selection_box.jsp           |  32 --
 web/terms.xhtml                               |   2 +-
 26 files changed, 506 insertions(+), 539 deletions(-)
 create mode 100644 web/WEB-INF/templates/generic/gender_selection_box.tpl
 create mode 100644 web/WEB-INF/templates/guest/guest_base.tpl
 create mode 100644 web/WEB-INF/templates/guest/guest_login_form.tpl
 delete mode 100644 web/customer/login.jsp
 create mode 100644 web/customer/login.xhtml
 delete mode 100644 web/customer/lost_passwd.jsp
 create mode 100644 web/customer/lost_passwd.xhtml
 delete mode 100644 web/customer/register.jsp
 create mode 100644 web/customer/register.xhtml
 delete mode 100644 web/static/forms/form_login.jsp
 delete mode 100644 web/static/gender_selection_box.jsp

diff --git a/lib/jcore.jar b/lib/jcore.jar
index a123dfa59112d18cb499c0fadcda07bd47cb19c2..526b59ecc5ea534f708216abf6c4ce26d6498229 100644
GIT binary patch
delta 14142
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
M#}RI^gAcI(2bSugxc~qF

delta 14425
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

diff --git a/lib/jsfcore.jar b/lib/jsfcore.jar
index caff7700e57165db4429d279d73535fb92ecf9fa..e49e7da85edc2d5d0509cf856c7ba53b384aa5e4 100644
GIT binary patch
delta 2877
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
H!*~A&p;M*r

delta 607
zcmY+BO-K}B7{~wf&f0G4ZaQjyw4tpFn`yG*QVqJXqrK~_Ba0et<ROoN5RuSfDMIa(
z5J)}hQ95|=kX`2L!K;YEb_zTQg&$pXBN8t`^FCVG3=hBOYyR*1%=3F*JDLa&4d}ig
z5CHZ@n%{+6^j#0;g07-s6XR!#0ySzK%wg@$DMg$<R94WM7UXzSlgt{?#r!6EnAde%
z(Vfs&{Om-_AC$54qO$G+J9D*dVZ-aOKfUbVaW4YO()2^zpl4>ayPtd>$R!X*Cla{j
zy|-ba3-^)2Q>0OVg-P^c77~ldVhIEIh#Xcihz+l=h&&GP5QiAW2_9)W#@ywU(D>+;
zyA6B?TEAzi*~ur<sz7}*!7NCV=}L=vEO{KVGJ_ny&x|m?XB-{@=bkvpz78r`ermTv
z+?BE;;*FqUEXwIIJ<zI&8vWk}?EKVt;jtf3cJrLn()4HbSslId8MJLzv0BMfdmZGo
z+C+EAAelWajb<ZayW*_WMou<#P5t1!V|@J*0+gBm$^W{{w|a85n(F(j0)MwbQKweK
iVq7a(S5%FUo^c`~*?yMx)0PvxWWd1NG9Z^!!hZl@r?Jxj

diff --git a/lib/jshop.jar b/lib/jshop.jar
index de624690e83b76846bd568033af36755b5783d77..6f80ece3c94a8412ed80548b7ff1c6f14c661d05 100644
GIT binary patch
delta 8808
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
b9O6sL^Xqx5bYJdo&wMM7lS6!iCGP)ku(8cc

delta 8856
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

diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
index da3ff07d..c9f0ee24 100644
--- a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
+++ b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
@@ -127,6 +127,7 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P
 	}
 
 	@Override
+	@Deprecated
 	public String getPrintableProduktAvailability (final Product product) {
 		// Trace message
 		this.getLogger().trace(MessageFormat.format("product={0} - CALLED!", product)); //NOI18N
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 98b67932..d7b1bde5 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -3,4 +3,8 @@
 			  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.jsfcore.validator.bool.privacy_terms.PrivacyTermsCheckboxValidator</validator-class>
+	</validator>
 </faces-config>
diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml
index 4577b9ae..d045118d 100644
--- a/web/WEB-INF/templates.dist/guest_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_page.xhtml
@@ -3,11 +3,10 @@
 <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/base.tpl">
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="title">Your page's title here</ui:define>
 
 		<ui:define name="menu">
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index bfaffe8a..7c5763ff 100644
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -14,13 +14,11 @@
 
 	<h:body>
 		<div id="top">
-			<ui:insert name="top">
-				<div id="header"> 
-					<div id="title">
-						<h1>Pizza-Service - <ui:insert name="title">Default title</ui:insert></h1>
-					</div>
+			<div id="header"> 
+				<div id="title">
+					<h1>Pizza-Service - <ui:insert name="title">Default title</ui:insert></h1>
 				</div>
-			</ui:insert>
+			</div>
 		</div>
 
 		<div id="menu_content">
diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
new file mode 100644
index 00000000..18b0d360
--- /dev/null
+++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl
@@ -0,0 +1,15 @@
+<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://java.sun.com/jsf/facelets">
+
+	<!--
+	TODO: Missing pre-select of choosen gender
+	//-->
+	<h:selectOneListbox class="select" id="gender" size="1">
+		<ui:repeat var="gender" value="#{Gender.values()}">
+			<option value="#{gender.name()}">#{gender}</option>
+		</ui:repeat>
+	</h:selectOneListbox>
+</ui:composition>
diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
new file mode 100644
index 00000000..5d8856b0
--- /dev/null
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -0,0 +1,13 @@
+<ui:composition
+	template="/WEB-INF/templates/base.tpl"
+	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://java.sun.com/jsf/facelets">
+
+	<!--
+	TODO Unused:
+	xmlns:basket="http://mxchange.org/jshop/tags/basket"
+	<basket:mini_basket basket="#{basket}" />
+	//-->
+</ui:composition>
diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/guest_login_form.tpl
new file mode 100644
index 00000000..a0a719bd
--- /dev/null
+++ b/web/WEB-INF/templates/guest/guest_login_form.tpl
@@ -0,0 +1,48 @@
+<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://java.sun.com/jsf/facelets">
+	<div id="customer_login_content">
+		<h:form acceptcharset="utf-8" id="login_form">
+			<div class="table">
+				<div class="table_header">
+					Bitte geben Sie Ihre Kundennummer und Passwort ein:
+				</div>
+
+				<fieldset id="login_data">
+					<legend title="Bitte geben Sie Ihre Kundennummer und das dazugehörige Passwort ein.">Bitte Daten eingeben:</legend>
+
+					<div class="table_row">
+						<div class="table_left">
+							<h:outputLabel for="id" value="Kundennummer:" />
+						</div>
+
+						<div class="table_right">
+							<h:inputText class="input" id="id" size="10" maxlength="20" />
+						</div>
+					</div>
+
+					<div class="clear"></div>
+
+					<div class="table_row">
+						<div class="table_left">
+							<h:outputLabel for="password" value="Passwort:" />
+						</div>
+
+						<div class="table_right">
+							<h:inputSecret class="input" id="password" size="10" maxlength="255" />
+						</div>
+					</div>
+
+					<div class="clear"></div>
+				</fieldset>
+
+				<div class="table_footer">
+					<h:commandButton class="reset" type="reset" value="Formular zurücksetzen" />
+					<h:commandButton class="submit" type="submit" action="#{controller.doLogin()}" value="Einloggen" />
+				</div>
+			</div>
+		</h:form>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index cfaaae02..0e4d7180 100644
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -7,6 +7,7 @@
 		<div class="menu_header">
 			Home
 		</div>
+
 		<ul>
 			<li><h:link title="Eingangsseite" outcome="index" value="Home" /></li>
 			<li><h:link title="Zum Warenkorb" outcome="basket" value="Zum Warenkorb" /></li>
@@ -16,6 +17,7 @@
 		<div class="menu_header">
 			Kundenlogin
 		</div>
+
 		<ul>
 			<li><h:link title="Login für bestehende Kunden" outcome="customer_login" value="Einloggen" /></li>
 			<li><h:link title="Anmeldung als neuer Kunde" outcome="customer_register" value="Neuer Kunde" /></li>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 1d88bf7b..fe867e30 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -44,6 +44,8 @@
 		<filter-name>Log4jServletFilter</filter-name>
 		<filter-class>org.apache.logging.log4j.web.Log4jServletFilter</filter-class>
 	</filter>
+	<!--
+	TODO: No longer used
 	<filter>
 		<description>A filter for handling added basket items</description>
 		<filter-name>BasketItemAddedFilter</filter-name>
@@ -53,6 +55,7 @@
 		<filter-name>BasketItemAddedFilter</filter-name>
 		<url-pattern>/form_handler/add_item.jsp</url-pattern>
 	</filter-mapping>
+	//-->
 	<filter-mapping>
 		<filter-name>Log4jServletFilter</filter-name>
 		<url-pattern>/*</url-pattern>
diff --git a/web/customer/login.jsp b/web/customer/login.jsp
deleted file mode 100644
index 0a5ad316..00000000
--- a/web/customer/login.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<%-- 
-	Document   : login
-	Created on : 11.08.2015, 11:35:53
-	Author     : Roland Haeder
---%>
-
-<%--<%@page errorPage="errorHandler.jsp" %>--%>
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
-<!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" xml:lang="de" lang="de">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link rel="stylesheet" href="${basePath}/style.css" type="text/css" />
-		<title>Pizza-Service - Einloggen</title>
-	</head>
-
-	<body>
-		<div id="header"> 
-			<div id="title">
-				<h1>Pizza-Service - Einloggen</h1>
-			</div>
-		</div>
-
-		<jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
-
-		<div id="content_outer">
-			<div id="content_title">
-				<h2>Einloggen als bestehender Kunde:</h2>
-			</div>
-
-			<div id="content">
-				<div class="para">
-					Noch kein Kunde? Einfach beim Bestellen anmelden oder <a href="${basePath}/customer/register.jsp">hier</a> anmelden.
-				</div>
-
-				<div class="para">
-					<jsp:include page="/static/forms/form_login.jsp" flush="false" />
-				</div>
-
-				<div class="para">
-					<a href="${basePath}/lost_passwd.jsp">Passwort vergessen?</a>
-				</div>
-			</div>
-		</div>
-
-		<jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
-	</body>
-</html>
diff --git a/web/customer/login.xhtml b/web/customer/login.xhtml
new file mode 100644
index 00000000..ab2c954d
--- /dev/null
+++ b/web/customer/login.xhtml
@@ -0,0 +1,39 @@
+<?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">Einloggen</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">
+			Zum Kundenbereich einloggen
+		</ui:define>
+
+		<ui:define name="content">
+			<div class="para">
+				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_register" 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/customer/lost_passwd.jsp b/web/customer/lost_passwd.jsp
deleted file mode 100644
index 7d5eb779..00000000
--- a/web/customer/lost_passwd.jsp
+++ /dev/null
@@ -1,93 +0,0 @@
-<%-- 
-	Document   : lost_passwd
-	Created on : 11.08.2015, 11:35:53
-	Author     : Roland Haeder
---%>
-
-<%--<%@page errorPage="errorHandler.jsp" %>--%>
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
-<!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" xml:lang="de" lang="de">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link rel="stylesheet" href="${basePath}/style.css" type="text/css" />
-		<title>Pizza-Service - Passwort vergessen</title>
-	</head>
-
-	<body>
-		<div id="header"> 
-			<div id="title">
-				<h1>Pizza-Service - Passwort vergessen</h1>
-			</div>
-		</div>
-
-		<jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
-
-		<div id="content_outer">
-			<div id="content_title">
-				<h2>Passwort vergessen:</h2>
-			</div>
-
-			<div id="content">
-				<div class="para">
-					Sie haben Ihr Passwort vergessen?
-				</div>
-
-				<div class="para">
-					<div id="login_form">
-						<form action="${basePath}/form_handler/do_passwd.jsp" accept-charset="utf-8" id="form" method="post">
-							<div class="table">
-								<div class="table_header">
-									Bitte geben Sie Ihre Kundennummer oder eMail-Adresse ein:
-								</div>
-
-								<fieldset id="login_data">
-									<legend title="Bitte Daten eingeben:">Bitte Daten eingeben:</legend>
-
-									<div class="table_row">
-										<div class="table_left">
-											Kundennummer:
-										</div>
-										<div class="table_right">
-											<input class="input" type="text" name="id" size="10" maxlength="20" />
-										</div>
-
-										<div class="clear"></div>
-									</div>
-
-									<div class="table_header">
-										... oder ...
-									</div>
-
-									<div class="table_row">
-										<div class="table_left">
-											eMail-Adresse:
-										</div>
-										<div class="table_right">
-											<input class="input" type="text" name="email" size="20" maxlength="255" />
-										</div>
-										<div class="clear"></div>
-									</div>
-
-								</fieldset>
-
-								<div class="table_footer">
-									<input type="hidden" name="redirect" value="<%=request.getRequestURI()%>" />
-									<input class="reset" type="reset" value="Formular zurücksetzen" />
-									<input class="submit" type="submit" name="send" value="Weiter zu Schritt 2" />
-								</div>
-							</div>
-						</form>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
-	</body>
-</html>
diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml
new file mode 100644
index 00000000..e08d28cb
--- /dev/null
+++ b/web/customer/lost_passwd.xhtml
@@ -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">Passwort vergessen</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">
+			Stellen Sie Ihr Passwort wieder her.
+		</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">
+							Sie haben Ihr Passwort vergessen?
+						</div>
+
+						<fieldset id="login_data">
+							<legend title="Bitte Daten eingeben:">Bitte Daten eingeben:</legend>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="id" value="Kundennummer:" />
+								</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">
+								... oder ...
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="email" value="eMail-Adresse:" />
+								</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="Formular zurücksetzen" />
+							<h:commandButton class="submit" type="submit" value="Weiter zu Schritt 2" action="#{controller.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/customer/register.jsp b/web/customer/register.jsp
deleted file mode 100644
index dc37728a..00000000
--- a/web/customer/register.jsp
+++ /dev/null
@@ -1,291 +0,0 @@
-<%-- 
-	Document   : register
-	Created on : 11.08.2015, 11:56:22
-	Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<%--<%@page errorPage="errorHandler.jsp" %>--%>
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
-<!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" xml:lang="de" lang="de">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link rel="stylesheet" href="${basePath}/style.css" type="text/css" />
-		<title>Pizza-Service - Neukunde</title>
-	</head>
-
-	<body>
-		<div id="header"> 
-			<div id="title">
-				<h1>Pizza-Service - Neukunde</h1>
-			</div>
-		</div>
-
-		<jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
-
-		<div id="content_outer">
-			<div id="content_title">
-				<h2>Anmelden zum Pizza-Service:</h2>
-			</div>
-
-			<div id="content">
-				<div>
-					Sie sind bereits Kunde? Dann <a href="${basePath}/customer/login.jsp">hier</a> einloggen.
-				</div>
-
-				<form action="${basePath}/form_handler/do_register.jsp" accept-charset="utf-8" id="form" method="post">
-					<div class="table">
-						<div class="table_header">
-							Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein:
-						</div>
-
-						<div class="para">
-							<fieldset id="personal_data">
-								<legend title="Bitte geben Sie Ihre Daten ein.">Bitte Ihre Daten eingeben:</legend>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="gender">Anrede</label>
-									</div>
-
-									<div class="table_right">
-										<c:set var="enabled" scope="request" value="true" />
-										<jsp:include page="/static/gender_selection_box.jsp" flush="false" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="companyname">Firmenname:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="companyname" name="companyName" size="15" maxlength="255" value="${customer.companyName}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="firstName">Vorname:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="firstName" name="firstName" size="10" maxlength="255" value="${customer.firstName}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="familyName">Nachname:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="familyName" name="familyName" size="10" maxlength="255" value="${customer.familyName}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="street">Straße:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="street" name="street" size="20" maxlength="255" value="${customer.street}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="houseNumber">Hausnummer:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="houseNumber" name="houseNumber" size="3" maxlength="5" value="${customer.houseNumber}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="zipCode">Postleitzahl:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="zipCode" name="zipCode" size="5" maxlength="6" value="${customer.zipCode}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="city">Ort:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="city" name="city" size="10" maxlength="255" value="${customer.city}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="phoneNumber">Telefon:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="phoneNumber" name="phoneNumber" size="20" maxlength="255" value="${customer.phoneNumber}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="faxNumber">Faxnummer:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="faxNumber" name="faxNumber" size="20" maxlength="255" value="${customer.faxNumber}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<label for="cellphoneNumber">Handy:</label>
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" id="cellphoneNumber" name="cellphoneNumber" size="20" maxlength="255" value="${customer.cellphoneNumber}" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-							</fieldset>
-						</div>
-
-						<div class="para">
-							<fieldset id="login_data">
-								<legend title="Zum Bestätigen wird Ihre Email-Adresse benötigt, für den Login Kundennummer und Passwort.">Email-Adresse und Passwort:</legend>
-
-								<div class="table_row">
-									<div class="table_left">
-										eMail-Adresse eingeben:
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" name="email1" size="20" maxlength="255" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										eMail-Adresse wiederholen:
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="text" name="email2" size="20" maxlength="255" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="para"></div>
-
-								<div class="table_row">
-									<div class="table_left">
-										Passwort eingeben:
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="password" name="password1" size="10" maxlength="255" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										Passwort wiederholen:
-									</div>
-
-									<div class="table_right">
-										<input class="input" type="password" name="password2" size="10" maxlength="255" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="para notice">
-									Die Kundennummer wird Ihnen später vergeben.
-								</div>
-							</fieldset>
-						</div>
-
-						<div class="para">
-							<fieldset id="terms_privacy">
-								<legend title="Bitte die AGBs und Datenschutzbestimmungen lesen und akzeptieren.">Rechtliches:</legend>
-
-								<div class="table_row">
-									<div class="table_left25">
-										 <input class="input" type="checkbox" name="privacy" value="1" />
-									</div>
-
-									<div class="table_right75">
-										Ja, ich habe die <a href="${basePath}/privacy.jsp" target="_blank">Datenschutzbestimmungen</a> gelesen und
-										auch verstanden.
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left25">
-										 <input class="input" type="checkbox" name="terms" value="1" />
-									</div>
-
-									<div class="table_right75">
-										Ja, ich habe die <a href="${basePath}/terms.jsp" target="_blank">Allgemeinen Geschäftsbedingungen</a> gelesen und
-										auch verstanden.
-									</div>
-
-									<div class="clear"></div>
-								</div>
-							</fieldset>
-						</div>
-
-						<div class="table_footer">
-							<input class="reset" type="reset" value="Formular zurücksetzen" />
-							<input class="submit" type="submit" name="send" value="Anmelden" />
-						</div>
-					</div>
-				</form>
-			</div>
-		</div>
-
-		<jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
-	</body>
-</html>
diff --git a/web/customer/register.xhtml b/web/customer/register.xhtml
new file mode 100644
index 00000000..82ecef8e
--- /dev/null
+++ b/web/customer/register.xhtml
@@ -0,0 +1,283 @@
+<?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">Neukunde</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">
+			Anmelden zum Pizza-Service:
+		</ui:define>
+
+		<ui:define name="content">
+			<div class="para">
+				Sie sind bereits Kunde? Dann <h:link outcome="customer_login" value="hier" /> einloggen.
+			</div>
+
+			<h:form acceptcharset="utf-8" id="register_form">
+				<div class="table">
+					<div class="table_header">
+						Anmelden als Neukunde
+					</div>
+
+					<div class="para notice">
+						Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein:
+					</div>
+
+					<div class="para">
+						<fieldset id="personal_data">
+							<legend title="Bitte geben Sie Ihre Daten ein.">Bitte Ihre Daten eingeben:</legend>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="gender" value="Anrede:" />
+								</div>
+
+								<div class="table_right">
+									<c:set var="enabled" scope="request" value="true" />
+									<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="companyname" value="Firmenname:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="companyname" size="15" maxlength="255" value="#{customer.companyName}" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="firstName" value="Vorname:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{customer.firstName}" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="familyName" value="Nachname:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{customer.familyName}" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="street" value="Straße:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="street" size="20" maxlength="255" value="#{customer.street}" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="houseNumber" value="Hausnummer:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{customer.houseNumber}" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="zipCode" value="Postleitzahl:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{customer.zipCode}" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="city" value="Ort:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="city" size="10" maxlength="255" value="#{customer.city}" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="phoneNumber" value="Telefon:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="phoneNumber" size="20" maxlength="255" value="#{customer.phoneNumber}" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="faxNumber" value="Faxnummer:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="faxNumber" size="20" maxlength="255" value="#{customer.faxNumber}" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="cellphoneNumber" value="Handy:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="cellphoneNumber" size="20" maxlength="255" value="#{customer.cellphoneNumber}" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+						</fieldset>
+					</div>
+
+					<div class="para">
+						<fieldset id="login_data">
+							<legend title="Zum Bestätigen wird Ihre Email-Adresse benötigt, für den Login Kundennummer und Passwort.">Email-Adresse und Passwort:</legend>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="emailAddress1" value="eMail-Adresse eingeben:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{customer.emailAddress}" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="emailAddress2" value="eMail-Adresse wiederholen:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{customer.emailAddress}" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="para"></div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="password1" value="Passwort eingeben:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputSecret class="input" id="password1" size="10" maxlength="255" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="password2" value="Passwort wiederholen:" />
+								</div>
+
+								<div class="table_right">
+									<h:inputSecret class="input" id="password2" size="10" maxlength="255" required="true" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="para notice">
+								Die Kundennummer wird Ihnen später vergeben.
+							</div>
+						</fieldset>
+					</div>
+
+					<div class="para">
+						<fieldset id="terms_privacy">
+							<legend title="Bitte die AGBs und Datenschutzbestimmungen lesen und akzeptieren.">Rechtliches:</legend>
+
+							<div class="table_row">
+								<div class="table_left25">
+									<h:selectBooleanCheckbox class="input" id="privacy" required="true" requiredMessage="Bitte den Datenschutzbestimmungen zustimmen.">
+										<f:validator validatorId="PrivacyTermsCheckboxValidator" />
+									</h:selectBooleanCheckbox>
+								</div>
+
+								<div class="table_right75">
+									Ja, ich habe die <h:link outcome="privacy" target="_blank" value="Datenschutzbestimmungen" /> gelesen und
+									auch verstanden.
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_row">
+								<div class="table_left25">
+									<h:selectBooleanCheckbox class="input" id="terms" required="true" requiredMessage="Bitte den AGBs zustimmen.">
+										<f:validator validatorId="PrivacyTermsCheckboxValidator" />
+									</h:selectBooleanCheckbox>
+								</div>
+
+								<div class="table_right75">
+									Ja, ich habe die <h:link outcome="terms" target="_blank" value="Allgemeinen Geschäftsbedingungen" /> gelesen und
+									auch verstanden.
+								</div>
+
+								<div class="clear"></div>
+							</div>
+						</fieldset>
+					</div>
+
+					<div class="table_footer">
+						<h:commandButton class="reset" type="reset" value="Formular zurücksetzen" />
+						<h:commandButton class="submit" type="submit" id="register" value="Anmelden" action="#{controller.doRegister()}" />
+					</div>
+				</div>
+			</h:form>
+		</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/imprint.xhtml b/web/imprint.xhtml
index be755270..f7512adf 100644
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -7,7 +7,7 @@
 	  xmlns:f="http://xmlns.jcp.org/jsf/core"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/base.tpl">
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="title">Impressum</ui:define>
 
 		<ui:define name="menu">
diff --git a/web/index.xhtml b/web/index.xhtml
index 08cf9c63..6e9ce0ff 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -12,7 +12,7 @@
 	xmlns:basket="http://mxchange.org/jshop/tags/basket"
 	//-->
 
-	<ui:composition template="/WEB-INF/templates/base.tpl">
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="title">Willkommen!</ui:define>
 
 		<ui:define name="menu">
@@ -26,8 +26,6 @@
 		<ui:define name="content">
 			<!--
 			TODO Not used!
-			<basket:mini_basket basket="#{basket}" />
-
 			<h:panelGrid class="basket_item_table" columnClasses="table_data_column" headerClass="table_header_column">
 				<f:facet name="header">
 					Bestellen? Bestellmenge: Produkt: Einzelpreis:
diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index 0dc63b18..99a00542 100644
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -7,7 +7,7 @@
 	  xmlns:f="http://xmlns.jcp.org/jsf/core"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/base.tpl">
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="title">Datenschutzbestimmungen</ui:define>
 
 		<ui:define name="menu">
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index bbc4cead..57b5048d 100644
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -1,7 +1,7 @@
 #top {
 	position: relative;
 	background-color: #036fab;
-	color: white;
+	color: #ffffff;
 	padding: 5px;
 	margin: 0px 0px 10px 0px;
 }
@@ -46,13 +46,13 @@
 }
 
 #top a:link, #top a:visited {
-	color: white;
+	color: #ffffff;
 	font-weight : bold;
 	text-decoration: none;
 }
 
 #top a:link:hover, #top a:visited:hover  {
-	color: black;
+	color: #000000;
 	font-weight : bold;
 	text-decoration : underline;
 }
@@ -78,25 +78,30 @@ table, .table {
 
 .table_row {
 	width: 100%;
+	min-height: 20px;
 }
 
 .table_left {
 	width: 250px;
+	min-height: 20px;
 	float: left;
 }
 
 .table_right {
 	width: 200px;
+	min-height: 20px;
 	float: right;
 }
 
 .table_left25 {
 	width: 20px;
+	min-height: 20px;
 	float: left;
 }
 
 .table_right75 {
 	width: 430px;
+	min-height: 20px;
 	float: right;
 }
 
diff --git a/web/resources/css/default.css b/web/resources/css/default.css
index c658b11b..1df064aa 100644
--- a/web/resources/css/default.css
+++ b/web/resources/css/default.css
@@ -7,12 +7,11 @@ body {
 }
 
 h1 {
-	border-bottom: 1px solid #AFAFAF; 
+	border-bottom: 1px solid #AFAFAF;
 	font-size:  16px;
 	font-weight: bold;
 	margin: 0px;
 	padding: 0px;
-	color: #D20005;
 }
 
 a:link, a:visited {
@@ -21,8 +20,12 @@ a:link, a:visited {
 	text-decoration: none;
 }
 
-a:link:hover, a:visited:hover  {
+a:link:hover, a:visited:hover {
 	color: #045491;
 	font-weight : bold;
 	text-decoration : underline;
 }
+
+label {
+	vertical-align: middle;
+}
diff --git a/web/static/forms/form_login.jsp b/web/static/forms/form_login.jsp
deleted file mode 100644
index 61b8c459..00000000
--- a/web/static/forms/form_login.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%-- 
-	Document   : login
-	Created on : 11.08.2015, 12:28:03
-	Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
-<div id="login_form">
-	<form action="${basePath}/form_handler/do_login.jsp" accept-charset="utf-8" id="form" method="post">
-		<div class="table">
-			<div class="table_header">
-				Bitte geben Sie Ihre Kundennummer und Passwort ein:
-			</div>
-
-			<fieldset id="login_data">
-				<legend title="Bitte Daten eingeben:">Bitte Daten eingeben:</legend>
-
-				<div class="table_row">
-					<div class="table_left">
-						Kundennummer:
-					</div>
-					<div class="table_right">
-						<input class="input" type="text" name="id" size="10" maxlength="20" />
-					</div>
-				</div>
-
-				<div class="clear"></div>
-
-				<div class="table_row">
-					<div class="table_left">
-						Passwort:
-					</div>
-					<div class="table_right">
-						<input class="input" type="password" name="password" size="10" maxlength="255" />
-					</div>
-				</div>
-
-				<div class="clear"></div>
-			</fieldset>
-
-			<div class="table_footer">
-				<input type="hidden" name="redirect" value="<%=request.getRequestURI()%>" />
-				<input class="reset" type="reset" value="Formular zurücksetzen" />
-				<input class="submit" type="submit" name="send" value="Einloggen" />
-			</div>
-		</div>
-	</form>
-</div>
diff --git a/web/static/gender_selection_box.jsp b/web/static/gender_selection_box.jsp
deleted file mode 100644
index 3482f032..00000000
--- a/web/static/gender_selection_box.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%-- 
-	Document   : gender_selection_box
-	Created on : 11.08.2015, 13:02:12
-	Author     : Roland Haeder
---%>
-<%@page import="org.mxchange.jcore.contact.Gender"%>
-<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
-<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%>
-<%@page import="org.mxchange.pizzaapplication.beans.customer.CustomerBean" %>
-
-<jsp:useBean id="customer" scope="session" class="org.mxchange.pizzaapplication.beans.customer.PizzaServiceCustomerBean" type="CustomerBean" />
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
-
-<select class="select" name="gender" id="gender" size="1" <%=controller.getDisabledHtmlFromSession(request, session)%>>
-	<%
-	// "Walk" through all genders and output them
-	for (final Gender gender : Gender.values()) {
-		%>
-		<option value="<%=gender.name()%>"<%
-		// Get gender from bean
-		Gender customerGender =  customer.getGender();
-
-		// Test it
-		if (customerGender.equals(gender)) {
-			// Output selected="selected"
-			out.print("selected=\"selected\"");
-		}
-		%>><%=gender%></option>
-		<%
-	}
-	%>
-</select>
diff --git a/web/terms.xhtml b/web/terms.xhtml
index e1de7989..89bcf35d 100644
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -7,7 +7,7 @@
 	  xmlns:f="http://xmlns.jcp.org/jsf/core"
 	  >
 
-	<ui:composition template="/WEB-INF/templates/base.tpl">
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="title">Allgemeine Gesch&auml;ftsbedingungen</ui:define>
 
 		<ui:define name="menu">
-- 
2.39.5