]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Continued with project:
authorRoland Haeder <roland@mxchange.org>
Mon, 17 Aug 2015 13:45:28 +0000 (15:45 +0200)
committerRoland Haeder <roland@mxchange.org>
Mon, 17 Aug 2015 13:50:26 +0000 (15:50 +0200)
- added new pages "privacy.jsp" and "terms.jsp"
- form "register.jsp" is basicly finished
- added more CSS classes
Signed-off-by:Roland Häder <roland@mxchange.org>

19 files changed:
src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java
web/admin/category.jsp
web/admin/product.jsp
web/bye.jsp
web/customer/login.jsp
web/customer/lost_passwd.jsp
web/customer/register.jsp
web/errorHandler.jsp
web/finished.jsp
web/index.jsp
web/preview.jsp
web/privacy.jsp [new file with mode: 0644]
web/static/admin/category_selection_box.jsp
web/static/admin/parent_category_selection_box.jsp
web/static/footer.jsp [new file with mode: 0644]
web/static/forms/form_login.jsp
web/static/gender_selection_box.jsp
web/style.css
web/terms.jsp [new file with mode: 0644]

index 41629a3e656015fb2107538e127bf417e1183657..80f749728c82e204f086f7a5e3c8d302ecc859f0 100644 (file)
@@ -403,8 +403,14 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P
                        throw new NullPointerException("session is null"); //NOI18N
                }
 
+               // Get "enabled" from request scope
+               Boolean enabled = Boolean.parseBoolean((String) request.getAttribute("enabled")); //NOI18N
+
+               // Debug message
+               this.getLogger().debug(MessageFormat.format("enabled={0}", enabled)); //NOI18N
+
                // Is something selected?
-               if (this.calculateTotalAmount(request, session) > 0) {
+               if ((enabled) || (this.calculateTotalAmount(request, session) > 0)) {
                        // Trace message
                        this.getLogger().trace("Returning empty string - EXIT!"); //NOI18N
 
index 1fd0c7929f28664d55a256de7f7344011e20d383..ab96eedf860f7a34d04c4b7718a11a27f95bbea6 100644 (file)
@@ -59,7 +59,7 @@
                                                        <c:forEach var="category" items="<%=app.getCategories()%>">
                                                        <tr>
                                                                <td>
-                                                                       <input type="checkbox" name="<%=PizzaCategoryDatabaseConstants.COLUMN_ID%>[${category.getId()}]" value="1" />
+                                                                       <input class="input" type="checkbox" name="<%=PizzaCategoryDatabaseConstants.COLUMN_ID%>[${category.getId()}]" value="1" />
                                                                </td>
                                                                <td>
                                                                        ${category.decodedTitle()}
@@ -72,9 +72,9 @@
 
                                                        <tr>
                                                                <td colspan="3" class="table_footer">
-                                                                       <input type="reset" value="Formular zurücksetzen" />
-                                                                       <input type="submit" name="edit" value="Ändern" />
-                                                                       <input type="submit" name="delete" value="Löschen" />
+                                                                       <input class="reset" type="reset" value="Formular zurücksetzen" />
+                                                                       <input class="submit" type="submit" name="edit" value="Ändern" />
+                                                                       <input class="delete" type="submit" name="delete" value="Löschen" />
                                                                </td>
                                                        </tr>
                                                </tbody>
                                                <fieldset id="product_data">
                                                        <legend>Bitte alle Felder ausfüllen:</legend>
 
-                                                       <div class="data_row">
+                                                       <div class="table_row">
                                                                <div class="table_left">
                                                                        Bezeichnung:
                                                                        <div class="tiny">(z.B. <em>Pizzen</em>)</div>
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <input type="text" name="<%=PizzaCategoryDatabaseConstants.COLUMN_TITLE%>" size="10" maxlength="255" />
+                                                                       <input class="input" type="text" name="<%=PizzaCategoryDatabaseConstants.COLUMN_TITLE%>" size="10" maxlength="255" />
                                                                </div>
 
                                                                <div class="clear"></div>
                                                        </div>
 
-                                                       <div class="data_row">
+                                                       <div class="table_row">
                                                                <div class="table_left">
                                                                        Elternkategorie:
                                                                </div>
                                                </fieldset>
 
                                                <div class="table_footer">
-                                                       <input type="reset" value="Formular zurücksetzen" />
-                                                       <input type="submit" name="add" value="Hinzufügen" />
+                                                       <input class="reset" type="reset" value="Formular zurücksetzen" />
+                                                       <input class="submit" type="submit" name="add" value="Hinzufügen" />
                                                </div>
                                        </div>
                                        </form>
index 8c35c45ea773b558ff83bc0dff41d142538fb5c0..78182e999c73c63c0d8150c0463010545b4a99fe 100644 (file)
@@ -68,7 +68,7 @@
                                                        <tr>
                                                                <td>
                                                                        ${product.getId()}:
-                                                                       <input type="checkbox" name="product[${product.getId()}]" value="1" />
+                                                                       <input class="input" type="checkbox" name="product[${product.getId()}]" value="1" />
                                                                </td>
                                                                <td>
                                                                        ${product.getTitle()}
@@ -86,9 +86,9 @@
                                                        </c:forEach>
                                                        <tr>
                                                                <td colspan="5" class="table_footer">
-                                                                       <input type="reset" value="Formular zurücksetzen" />
-                                                                       <input type="submit" name="edit" value="Ändern" />
-                                                                       <input type="submit" name="delete" value="Löschen" />
+                                                                       <input class="reset" type="reset" value="Formular zurücksetzen" />
+                                                                       <input class="submit" type="submit" name="edit" value="Ändern" />
+                                                                       <input class="delete" type="submit" name="delete" value="Löschen" />
                                                                </td>
                                                        </tr>
                                                </tbody>
                                                <fieldset id="product_data">
                                                        <legend>Bitte alle Felder ausfüllen:</legend>
 
-                                                       <div class="data_row">
+                                                       <div class="table_row">
                                                                <div class="table_left">
                                                                        Produktbezeichnung:
                                                                        <div class="tiny">(z.B. <em>Pizza Italia</em>)</div>
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <input type="text" name="<%=PizzaProductDatabaseConstants.COLUMN_TITLE%>" size="10" maxlength="255" />
+                                                                       <input class="input" type="text" name="<%=PizzaProductDatabaseConstants.COLUMN_TITLE%>" size="10" maxlength="255" />
                                                                </div>
 
                                                                <div class="clear"></div>
                                                        </div>
 
-                                                       <div class="data_row">
+                                                       <div class="table_row">
                                                                <div class="table_left">
                                                                        Einzelpreis:
                                                                        <div class="tiny">(z.B. <em>50.0</em>)</div>
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <input type="text" name="<%=PizzaProductDatabaseConstants.COLUMN_PRICE%>" size="10" maxlength="255" />
+                                                                       <input class="input" type="text" name="<%=PizzaProductDatabaseConstants.COLUMN_PRICE%>" size="10" maxlength="255" />
                                                                </div>
 
                                                                <div class="clear"></div>
                                                        </div>
 
-                                                       <div class="data_row">
+                                                       <div class="table_row">
                                                                <div class="table_left">
                                                                        Kategorie:
                                                                </div>
                                                                <div class="clear"></div>
                                                        </div>
 
-                                                       <div class="data_row">
+                                                       <div class="table_row">
                                                                <div class="table_left">
                                                                        Verfügbar:
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <select name="available" size="1">
+                                                                       <select class="select" name="available" size="1">
                                                                                <option value="true">Ja</option>
                                                                                <option value="false">Nein</option>
                                                                        </select>
                                                </fieldset>
 
                                                <div class="table_footer">
-                                                       <input type="reset" value="Formular zurücksetzen" />
-                                                       <input type="submit" name="add" value="Hinzufügen" />
+                                                       <input class="reset" type="reset" value="Formular zurücksetzen" />
+                                                       <input class="submit" type="submit" name="add" value="Hinzufügen" />
                                                </div>
                                        </div>
                                        </form>
index 92ecc3644d6ece3c978125e960bde98fef835575..1ee657b7ac0d4af5f56ee3e32c044385198f177c 100644 (file)
@@ -42,5 +42,7 @@
                                %>
                        </div>
                </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
        </body>
 </html>
index a34cb9cd9626b7efb068a5ac1335e29d1397064e..df9e43ad0f1634b47de64a77d6a47e955591d11a 100644 (file)
@@ -41,5 +41,7 @@
                                </div>
                        </div>
                </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
        </body>
 </html>
index efc2ee2f82b74d90562b2bc1d2fa1bb9a3cb5ba1..e72ca3859ab142296287d8e59453f600eba53a6f 100644 (file)
@@ -37,7 +37,7 @@
                                                <form action="<%=request.getContextPath()%>/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:
+                                                                       Bitte geben Sie Ihre Kundennummer oder eMail-Adresse ein:
                                                                </div>
 
                                                                <fieldset id="login_data">
@@ -48,7 +48,7 @@
                                                                                        Kundennummer:
                                                                                </div>
                                                                                <div class="table_right">
-                                                                                       <input type="text" name="id" size="10" maxlength="20" />
+                                                                                       <input class="input" type="text" name="id" size="10" maxlength="20" />
                                                                                </div>
 
                                                                                <div class="clear"></div>
 
                                                                        <div class="table_row">
                                                                                <div class="table_left">
-                                                                                       Email-Adresse:
+                                                                                       eMail-Adresse:
                                                                                </div>
                                                                                <div class="table_right">
-                                                                                       <input type="text" name="email" size="20" maxlength="255" />
+                                                                                       <input class="input" type="text" name="email" size="20" maxlength="255" />
                                                                                </div>
                                                                                <div class="clear"></div>
                                                                        </div>
@@ -72,8 +72,8 @@
 
                                                                <div class="table_footer">
                                                                        <input type="hidden" name="redirect" value="<%=request.getRequestURI()%>" />
-                                                                       <input type="reset" value="Formular zurücksetzen" />
-                                                                       <input type="submit" name="send" value="Weiter zu Schritt 2" />
+                                                                       <input class="reset" type="reset" value="Formular zurücksetzen" />
+                                                                       <input class="submit" type="submit" name="send" value="Weiter zu Schritt 2" />
                                                                </div>
                                                        </div>
                                                </form>
@@ -81,5 +81,7 @@
                                </div>
                        </div>
                </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
        </body>
 </html>
index 5fe64c2abd891feec27b00bb88f4a8b3f0c74663..84c841dc8a4f94c2b77ae04bc95dde974d0aa670 100644 (file)
@@ -4,6 +4,7 @@
        Author     : Roland Haeder
 --%>
 
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%>
 
                                                        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="true" />
+                                                                       </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="surname">Vorname:</label>
+                                                                       </div>
+
+                                                                       <div class="table_right">
+                                                                               <input class="input" type="text" id="surname" name="surname" size="10" maxlength="255" value="${customer.surname}" />
+                                                                       </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="<%=request.getContextPath()%>/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="<%=request.getContextPath()%>/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 type="reset" value="Formular zurücksetzen" />
-                                                       <input type="submit" name="send" value="Anmelden" />
+                                                       <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/footer.jsp" flush="true" />
        </body>
 </html>
index e733496b67f8c9f14f90828eaa53d6945b90ff09..b193277b1ad183f539e0601b11279021e46beb26 100644 (file)
@@ -43,5 +43,7 @@
                                </ul>
                        </div>
                </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
        </body>
 </html>
index d0b4150e9b9c9198b23bf96a2de168a49efd50dc..42715efbed795df3fb6ec885335b52b9f96b8ec2 100644 (file)
                                </table>
                        </div>
                </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
        </body>
 </html>
index 54f3d8d5323cc4a405c8328e8562fe53ec2519c3..ee2e596ff9fb7f77ada187f3c321d90482bf875e 100644 (file)
                                                        %>
                                                        <tr>
                                                                <td>
-                                                                       <input type="checkbox" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_CHOOSE, product.getId())%>" value="1" <%=app.getCheckedHtmlFromProduct(product, request, session)%> />
+                                                                       <input class="input" type="checkbox" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_CHOOSE, product.getId())%>" value="1" <%=app.getCheckedHtmlFromProduct(product, request, session)%> />
                                                                </td>
                                                                <td>
-                                                                       <input type="text" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_AMOUNT, product.getId())%>" value="<%=app.getAmountFromSession(product, session)%>" size="3" maxlength="20" />
+                                                                       <input class="input" type="text" name="<%=String.format(PizzaApplication.HTTP_PARAM_MASK, PizzaApplication.HTTP_PARAM_AMOUNT, product.getId())%>" value="<%=app.getAmountFromSession(product, session)%>" size="3" maxlength="20" />
                                                                </td>
                                                                <td>
                                                                        <%=product.getTitle()%>
@@ -89,8 +89,8 @@
 
                                                <tr>
                                                        <td colspan="4" class="table_footer">
-                                                               <input type="reset" value="Formular zurücksetzen" />
-                                                               <input type="submit" name="send" value="Bestellung ansehen" />
+                                                               <input class="reset" type="reset" value="Formular zurücksetzen" />
+                                                               <input class="submit" type="submit" name="send" value="Bestellung ansehen" />
                                                        </td>
                                                </tr>
                                        </tbody>
@@ -98,5 +98,7 @@
                                </form>
                        </div>
                </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
        </body>
 </html>
index 833d5f631c7414de38ae8790328f2df867d08c27..495e14d5a6ba0ffc2ab3d606a99af039ab7a232d 100644 (file)
@@ -4,6 +4,7 @@
        Author     : Roland Haeder
 --%>
 
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%--<%@page errorPage="errorHandler.jsp" %>--%>
 <%@page import="java.util.Iterator"%>
 <%@page import="java.util.Map"%>
                                                                <fieldset id="personal_data">
                                                                        <legend title="Bitte geben Sie Ihre Daten ein.">Bitte Ihre Daten eingeben:</legend>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="gender">Anrede</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
+                                                                               <div class="table_right">
+                                                                                       <c:set var="enabled" scope="request" value="false" />
                                                                                        <jsp:include page="/static/gender_selection_box.jsp" flush="true" />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="companyname">Firmenname:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="companyname" name="companyName" size="15" maxlength="255" value="${customer.companyName}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="companyname" name="companyName" size="15" maxlength="255" value="${customer.companyName}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="surname">Vorname:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="surname" name="surname" size="10" maxlength="255" value="${customer.surname}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="surname" name="surname" size="10" maxlength="255" value="${customer.surname}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="familyName">Nachname:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="familyName" name="familyName" size="10" maxlength="255" value="${customer.familyName}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="familyName" name="familyName" size="10" maxlength="255" value="${customer.familyName}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="street">Straße:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="street" name="street" size="20" maxlength="255" value="${customer.street}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="street" name="street" size="20" maxlength="255" value="${customer.street}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="houseNumber">Hausnummer:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="houseNumber" name="houseNumber" size="3" maxlength="5" value="${customer.houseNumber}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="houseNumber" name="houseNumber" size="3" maxlength="5" value="${customer.houseNumber}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="zipCode">Postleitzahl:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="zipCode" name="zipCode" size="5" maxlength="6" value="${customer.zipCode}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="zipCode" name="zipCode" size="5" maxlength="6" value="${customer.zipCode}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="city">Ort:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="city" name="city" size="10" maxlength="255" value="${customer.city}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="city" name="city" size="10" maxlength="255" value="${customer.city}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="phoneNumber">Telefon:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="phoneNumber" name="phoneNumber" size="20" maxlength="255" value="${customer.phoneNumber}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="phoneNumber" name="phoneNumber" size="20" maxlength="255" value="${customer.phoneNumber}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="faxNumber">Faxnummer:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="faxNumber" name="faxNumber" size="20" maxlength="255" value="${customer.faxNumber}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="faxNumber" name="faxNumber" size="20" maxlength="255" value="${customer.faxNumber}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
                                                                        </div>
 
-                                                                       <div class="data_row">
-                                                                               <div class="data_left">
+                                                                       <div class="table_row">
+                                                                               <div class="table_left">
                                                                                        <label for="cellphoneNumber">Handy:</label>
                                                                                </div>
 
-                                                                               <div class="data_right">
-                                                                                       <input type="text" id="cellphoneNumber" name="cellphoneNumber" size="20" maxlength="255" value="${customer.cellphoneNumber}" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                                               <div class="table_right">
+                                                                                       <input class="input" type="text" id="cellphoneNumber" name="cellphoneNumber" size="20" maxlength="255" value="${customer.cellphoneNumber}" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                                                </div>
 
                                                                                <div class="clear"></div>
 
                                                <tr>
                                                        <td colspan="5" class="table_footer">
-                                                               <input type="reset" value="Formular zurücksetzen" />
-                                                               <input type="submit" name="send" value="Bestellung abschliessen" <%=app.getDisabledHtmlFromSession(request, session)%> />
+                                                               <input class="reset" type="reset" value="Formular zurücksetzen" />
+                                                               <input class="submit" type="submit" name="send" value="Bestellung abschliessen" <%=app.getDisabledHtmlFromSession(request, session)%> />
                                                        </td>
                                                </tr>
                                        </tbody>
                                </form>
                        </div>
                </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
        </body>
 </html>
diff --git a/web/privacy.jsp b/web/privacy.jsp
new file mode 100644 (file)
index 0000000..2471b06
--- /dev/null
@@ -0,0 +1,37 @@
+<%-- 
+       Document   : privacy
+       Created on : 11.08.2015, 11:56:22
+       Author     : Roland Haeder
+--%>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%>
+
+<!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="<%=request.getContextPath()%>/style.css" type="text/css"/>
+               <title><%=PizzaServiceApplication.MAIN_TITLE%> - Datenschutzbestimmungen</title>
+       </head>
+
+       <body>
+               <div id="title">
+                       <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Datenschutzbestimmungen</h1>
+               </div>
+
+               <jsp:include page="/static/menu.jsp" flush="true" />
+
+               <div id="content_outer">
+                       <div id="content_title">
+                               <h2>Datenschutzbestimmungen:</h2>
+                       </div>
+
+                       <div id="content">
+                       </div>
+               </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
+       </body>
+</html>
index 6e278ef45df1d72ee3d731adbe3447c8b507da21..0de4d8c022473956ca16db9f421323336bc66171 100644 (file)
@@ -14,7 +14,7 @@
        PizzaApplication app = PizzaServiceApplication.getInstance(application);
 %>
 
-<select name="category" size="1">
+<select class="select" name="category" size="1">
        <c:forEach var="category" items="<%=app.getCategories()%>">
                <option value="${category.getId()}">${category.decodedTitle()}</option>
        </c:forEach>
index b6642006f67bb743a54571d48f3f2c29d0f48d94..2f5b2ee74723d4d5168c881e120ea29685b60f2f 100644 (file)
@@ -14,7 +14,7 @@
        PizzaApplication app = PizzaServiceApplication.getInstance(application);
 %>
 
-<select name="<%=PizzaCategoryDatabaseConstants.COLUMN_PARENT%>" size="1">
+<select class="select" name="<%=PizzaCategoryDatabaseConstants.COLUMN_PARENT%>" size="1">
        <option value="">Ist oberste Kategorie</option>
        <c:forEach var="category" items="<%=app.getCategories()%>">
                <option value="${category.getId()}">${category.decodedTitle()}</option>
diff --git a/web/static/footer.jsp b/web/static/footer.jsp
new file mode 100644 (file)
index 0000000..306b486
--- /dev/null
@@ -0,0 +1,10 @@
+<%-- 
+       Document   : footer
+       Created on : 11.08.2015, 12:28:03
+       Author     : Roland Haeder
+--%>
+<div class="footer">
+       <ul class="footer_nav">
+               <li>
+       </ul>
+</div>
index 5d795c1a75b36c8acdd78259a58c2f29b4551b7c..8c187eea42f5ff7337c8ccf43d17a83153bc22cc 100644 (file)
@@ -18,7 +18,7 @@
                                                Kundennummer:
                                        </div>
                                        <div class="table_right">
-                                               <input type="text" name="id" size="10" maxlength="20" />
+                                               <input class="input" type="text" name="id" size="10" maxlength="20" />
                                        </div>
                                </div>
 
@@ -29,7 +29,7 @@
                                                Passwort:
                                        </div>
                                        <div class="table_right">
-                                               <input type="password" name="password" size="10" maxlength="255" />
+                                               <input class="input" type="password" name="password" size="10" maxlength="255" />
                                        </div>
                                </div>
 
@@ -38,8 +38,8 @@
 
                        <div class="table_footer">
                                <input type="hidden" name="redirect" value="<%=request.getRequestURI()%>" />
-                               <input type="reset" value="Formular zurücksetzen" />
-                               <input type="submit" name="send" value="Einloggen" />
+                               <input class="reset" type="reset" value="Formular zurücksetzen" />
+                               <input class="submit" type="submit" name="send" value="Einloggen" />
                        </div>
                </div>
        </form>
index d761f48dac845730aa376038375e5ec0f3c296d2..14ccaadc5026c44352bb1b0c501c7c659ac96f60 100644 (file)
@@ -15,7 +15,7 @@
        PizzaApplication app = PizzaServiceApplication.getInstance(application);
 %>
 
-<select name="gender" id="gender" size="1" <%=app.getDisabledHtmlFromSession(request, session)%>>
+<select class="select" name="gender" id="gender" size="1" <%=app.getDisabledHtmlFromSession(request, session)%>>
        <%
        // "Walk" through all genders and output them
        for (final Gender gender : Gender.values()) {
index 06d50a9b9f1bbe7f5e3c4585a76fc075bd94506a..7dd8fbdd4595adb1e0c557ca1b7d90f0178e982c 100644 (file)
@@ -4,18 +4,17 @@ div {
 }
 /**/
 
-.data_row {
-       width: 100%;
+table, .table {
+       margin: 0px;
+       padding: 0px;
 }
 
-.data_left {
-       width: 100px;
-       float: left;
+.table {
+       width: 500px;
 }
 
-.data_right {
-       width: 150px;
-       float: right;
+.table_row {
+       width: 100%;
 }
 
 .table_left {
@@ -24,27 +23,24 @@ div {
 }
 
 .table_right {
-       width: 150px;
+       width: 200px;
        float: right;
 }
 
-.clear {
-       clear: both;
-}
-
-table, .table {
-       margin: 0px;
-       padding: 0px;
-}
-
-.table {
-       width: 500px;
+.table_left25 {
+       width: 20px;
+       float: left;
 }
 
-.table_row {
-       width: 100%;
+.table_right75 {
+       width: 430px;
+       float: right;
 }
 
 .para {
        padding: 5px 5px 5px 5px;
 }
+
+.clear {
+       clear: both;
+}
diff --git a/web/terms.jsp b/web/terms.jsp
new file mode 100644 (file)
index 0000000..f3025a1
--- /dev/null
@@ -0,0 +1,37 @@
+<%-- 
+       Document   : privacy
+       Created on : 11.08.2015, 11:56:22
+       Author     : Roland Haeder
+--%>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%>
+
+<!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="<%=request.getContextPath()%>/style.css" type="text/css"/>
+               <title><%=PizzaServiceApplication.MAIN_TITLE%> - Allgemeine Geschäftsbedingungen</title>
+       </head>
+
+       <body>
+               <div id="title">
+                       <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Allgemeine Geschäftsbedingungen</h1>
+               </div>
+
+               <jsp:include page="/static/menu.jsp" flush="true" />
+
+               <div id="content_outer">
+                       <div id="content_title">
+                               <h2>Allgemeine Geschäftsbedingungen:</h2>
+                       </div>
+
+                       <div id="content">
+                       </div>
+               </div>
+
+               <jsp:include page="/static/footer.jsp" flush="true" />
+       </body>
+</html>