]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Refacturing towards JSF/EJB:
authorRoland Haeder <roland@mxchange.org>
Thu, 3 Sep 2015 11:38:58 +0000 (13:38 +0200)
committerRoland Haeder <roland@mxchange.org>
Thu, 3 Sep 2015 11:41:28 +0000 (13:41 +0200)
- renamed and prepared JSPs to XHTML (JSF)
- updated jcore, jsfcore and jshop
- added own validator for privacy/terms checkboxes
- still the "mini basket" is not functional yet, maybe it will come as a template?
- introduced guest_base.tpl for all "guest" pages
Signed-off-by:Roland Häder <roland@mxchange.org>

26 files changed:
lib/jcore.jar
lib/jsfcore.jar
lib/jshop.jar
src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
web/WEB-INF/faces-config.xml
web/WEB-INF/templates.dist/guest_page.xhtml
web/WEB-INF/templates/base.tpl
web/WEB-INF/templates/generic/gender_selection_box.tpl [new file with mode: 0644]
web/WEB-INF/templates/guest/guest_base.tpl [new file with mode: 0644]
web/WEB-INF/templates/guest/guest_login_form.tpl [new file with mode: 0644]
web/WEB-INF/templates/guest/guest_menu.tpl
web/WEB-INF/web.xml
web/customer/login.jsp [deleted file]
web/customer/login.xhtml [new file with mode: 0644]
web/customer/lost_passwd.jsp [deleted file]
web/customer/lost_passwd.xhtml [new file with mode: 0644]
web/customer/register.jsp [deleted file]
web/customer/register.xhtml [new file with mode: 0644]
web/imprint.xhtml
web/index.xhtml
web/privacy.xhtml
web/resources/css/cssLayout.css
web/resources/css/default.css
web/static/forms/form_login.jsp [deleted file]
web/static/gender_selection_box.jsp [deleted file]
web/terms.xhtml

index a123dfa59112d18cb499c0fadcda07bd47cb19c2..526b59ecc5ea534f708216abf6c4ce26d6498229 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ
index caff7700e57165db4429d279d73535fb92ecf9fa..e49e7da85edc2d5d0509cf856c7ba53b384aa5e4 100644 (file)
Binary files a/lib/jsfcore.jar and b/lib/jsfcore.jar differ
index de624690e83b76846bd568033af36755b5783d77..6f80ece3c94a8412ed80548b7ff1c6f14c661d05 100644 (file)
Binary files a/lib/jshop.jar and b/lib/jshop.jar differ
index da3ff07ddda809e722d6d3a1297cde06df92dbf9..c9f0ee2415c4de5290b1d46c411bb6e8b8c04b32 100644 (file)
@@ -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
index 98b67932ada56591c7e863a7f086b702db3799bb..d7b1bde5d722572bc31a46ec17391bcd6e46cacb 100644 (file)
@@ -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>
index 4577b9ae93b9ad7b946204da8f94b7b9231ff998..d045118dbeeb0c0fef9ea9a4dfc2062c217645e5 100644 (file)
@@ -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">
index bfaffe8aababbc0f16a29630b5f2b9e09f493fff..7c5763ffae87d6bc143255dc5961825fb2da85af 100644 (file)
 
        <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 (file)
index 0000000..18b0d36
--- /dev/null
@@ -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 (file)
index 0000000..5d8856b
--- /dev/null
@@ -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 (file)
index 0000000..a0a719b
--- /dev/null
@@ -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>
index cfaaae027208fa76b6c2ede6bd8071b7a9bee6ad..0e4d7180f3ad68c4aeb7f9055371d53f09c97c6d 100644 (file)
@@ -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>
index 1d88bf7b44977260aa8862dda9ca52a2b84d3008..fe867e306cca77540d014269922c474bc173bdda 100644 (file)
@@ -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 (file)
index 0a5ad31..0000000
+++ /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 (file)
index 0000000..ab2c954
--- /dev/null
@@ -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 (file)
index 7d5eb77..0000000
+++ /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 (file)
index 0000000..e08d28c
--- /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">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 (file)
index dc37728..0000000
+++ /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 (file)
index 0000000..82ecef8
--- /dev/null
@@ -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>
index be755270729c427f05ac7550c6708252e69c94b8..f7512adf5764e2da212c4800c9a487d39d8878dd 100644 (file)
@@ -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">
index 08cf9c6338421137c4be46bc7cdd2f44d415a975..6e9ce0ff4c375c7137f663a73337c7baf333b94e 100644 (file)
@@ -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:
index 0dc63b1847dcad663e50bf9838d6e2b58fcbf7ca..99a005429add6dcbae33bcca3740e612df02c9ad 100644 (file)
@@ -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">
index bbc4cead2cd7aa626396e2761e60f0051aa4892c..57b5048d5fea92510a74ca0e1ca2c3b0674c1bc8 100644 (file)
@@ -1,7 +1,7 @@
 #top {
        position: relative;
        background-color: #036fab;
-       color: white;
+       color: #ffffff;
        padding: 5px;
        margin: 0px 0px 10px 0px;
 }
 }
 
 #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;
 }
 
index c658b11bd0dced0c1e8eec5e3a16f14af1c3878e..1df064aa1458424a9174c144060d69d34971fb82 100644 (file)
@@ -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 (file)
index 61b8c45..0000000
+++ /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 (file)
index 3482f03..0000000
+++ /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>
index e1de7989ff7f0b346015fa41443614ec51c9e0da..89bcf35dbabd36a41055ada239fcfb995cf3a47c 100644 (file)
@@ -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">