From: Roland Haeder Date: Mon, 17 Aug 2015 13:45:28 +0000 (+0200) Subject: Continued with project: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d90f77e7670607cc7fb4bbb3db1422c97004ee57;p=pizzaservice-war.git Continued with project: - added new pages "privacy.jsp" and "terms.jsp" - form "register.jsp" is basicly finished - added more CSS classes Signed-off-by:Roland Häder --- diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java index 41629a3e..80f74972 100644 --- a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java +++ b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java @@ -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 diff --git a/web/admin/category.jsp b/web/admin/category.jsp index 1fd0c792..ab96eedf 100644 --- a/web/admin/category.jsp +++ b/web/admin/category.jsp @@ -59,7 +59,7 @@ - + ${category.decodedTitle()} @@ -72,9 +72,9 @@ - - - + + + @@ -92,20 +92,20 @@
Bitte alle Felder ausfüllen: -
+
Bezeichnung:
(z.B. Pizzen)
- +
-
+
Elternkategorie:
@@ -119,8 +119,8 @@
- - + +
diff --git a/web/admin/product.jsp b/web/admin/product.jsp index 8c35c45e..78182e99 100644 --- a/web/admin/product.jsp +++ b/web/admin/product.jsp @@ -68,7 +68,7 @@ ${product.getId()}: - + ${product.getTitle()} @@ -86,9 +86,9 @@ - - - + + + @@ -106,33 +106,33 @@
Bitte alle Felder ausfüllen: -
+
Produktbezeichnung:
(z.B. Pizza Italia)
- +
-
+
Einzelpreis:
(z.B. 50.0)
- +
-
+
Kategorie:
@@ -144,13 +144,13 @@
-
+
Verfügbar:
- @@ -161,8 +161,8 @@
- - + +
diff --git a/web/bye.jsp b/web/bye.jsp index 92ecc364..1ee657b7 100644 --- a/web/bye.jsp +++ b/web/bye.jsp @@ -42,5 +42,7 @@ %> + + diff --git a/web/customer/login.jsp b/web/customer/login.jsp index a34cb9cd..df9e43ad 100644 --- a/web/customer/login.jsp +++ b/web/customer/login.jsp @@ -41,5 +41,7 @@ + + diff --git a/web/customer/lost_passwd.jsp b/web/customer/lost_passwd.jsp index efc2ee2f..e72ca385 100644 --- a/web/customer/lost_passwd.jsp +++ b/web/customer/lost_passwd.jsp @@ -37,7 +37,7 @@
- Bitte geben Sie Ihre Kundennummer oder Email-Adresse ein: + Bitte geben Sie Ihre Kundennummer oder eMail-Adresse ein:
@@ -48,7 +48,7 @@ Kundennummer:
- +
@@ -60,10 +60,10 @@
- Email-Adresse: + eMail-Adresse:
- +
@@ -72,8 +72,8 @@
- - + +
@@ -81,5 +81,7 @@ + + diff --git a/web/customer/register.jsp b/web/customer/register.jsp index 5fe64c2a..84c841dc 100644 --- a/web/customer/register.jsp +++ b/web/customer/register.jsp @@ -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"%> @@ -38,13 +39,246 @@ Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein: +
+
+ Bitte Ihre Daten eingeben: + +
+
+ +
+ +
+ + +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+ +
+
+ Email-Adresse und Passwort: + +
+
+ eMail-Adresse eingeben: +
+ +
+ +
+ +
+
+ +
+
+ eMail-Adresse wiederholen: +
+ +
+ +
+ +
+
+ +
+ +
+
+ Passwort eingeben: +
+ +
+ +
+ +
+
+ +
+
+ Passwort wiederholen: +
+ +
+ +
+ +
+
+ +
+ Die Kundennummer wird Ihnen später vergeben. +
+
+
+ +
+
+ Rechtliches: + +
+
+ +
+ +
+ Ja, ich habe die Datenschutzbestimmungen gelesen und + auch verstanden. +
+ +
+
+ +
+
+ +
+ +
+ Ja, ich habe die Allgemeinen Geschäftsbedingungen gelesen und + auch verstanden. +
+ +
+
+
+
+
- - + +
+ + diff --git a/web/errorHandler.jsp b/web/errorHandler.jsp index e733496b..b193277b 100644 --- a/web/errorHandler.jsp +++ b/web/errorHandler.jsp @@ -43,5 +43,7 @@ + + diff --git a/web/finished.jsp b/web/finished.jsp index d0b4150e..42715efb 100644 --- a/web/finished.jsp +++ b/web/finished.jsp @@ -159,5 +159,7 @@ + + diff --git a/web/index.jsp b/web/index.jsp index 54f3d8d5..ee2e596f 100644 --- a/web/index.jsp +++ b/web/index.jsp @@ -71,10 +71,10 @@ %> - /> + /> - + <%=product.getTitle()%> @@ -89,8 +89,8 @@ - - + + @@ -98,5 +98,7 @@ + + diff --git a/web/preview.jsp b/web/preview.jsp index 833d5f63..495e14d5 100644 --- a/web/preview.jsp +++ b/web/preview.jsp @@ -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"%> @@ -124,133 +125,134 @@
Bitte Ihre Daten eingeben: -
-
+
+
-
+
+
-
-
+
+
-
- /> +
+ />
-
-
+
+
-
- /> +
+ />
-
-
+
+
-
- /> +
+ />
-
-
+
+
-
- /> +
+ />
-
-
+
+
-
- /> +
+ />
-
-
+
+
-
- /> +
+ />
-
-
+
+
-
- /> +
+ />
-
-
+
+
-
- /> +
+ />
-
-
+
+
-
- /> +
+ />
-
-
+
+
-
- /> +
+ />
@@ -261,8 +263,8 @@ - - /> + + /> @@ -270,5 +272,7 @@
+ + diff --git a/web/privacy.jsp b/web/privacy.jsp new file mode 100644 index 00000000..2471b06c --- /dev/null +++ b/web/privacy.jsp @@ -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"%> + + + + + + + <%=PizzaServiceApplication.MAIN_TITLE%> - Datenschutzbestimmungen + + + +
+

<%=PizzaServiceApplication.MAIN_TITLE%> - Datenschutzbestimmungen

+
+ + + +
+
+

Datenschutzbestimmungen:

+
+ +
+
+
+ + + + diff --git a/web/static/admin/category_selection_box.jsp b/web/static/admin/category_selection_box.jsp index 6e278ef4..0de4d8c0 100644 --- a/web/static/admin/category_selection_box.jsp +++ b/web/static/admin/category_selection_box.jsp @@ -14,7 +14,7 @@ PizzaApplication app = PizzaServiceApplication.getInstance(application); %> - diff --git a/web/static/admin/parent_category_selection_box.jsp b/web/static/admin/parent_category_selection_box.jsp index b6642006..2f5b2ee7 100644 --- a/web/static/admin/parent_category_selection_box.jsp +++ b/web/static/admin/parent_category_selection_box.jsp @@ -14,7 +14,7 @@ PizzaApplication app = PizzaServiceApplication.getInstance(application); %> - diff --git a/web/static/footer.jsp b/web/static/footer.jsp new file mode 100644 index 00000000..306b4867 --- /dev/null +++ b/web/static/footer.jsp @@ -0,0 +1,10 @@ +<%-- + Document : footer + Created on : 11.08.2015, 12:28:03 + Author : Roland Haeder +--%> +
+
    +
  • +
+
diff --git a/web/static/forms/form_login.jsp b/web/static/forms/form_login.jsp index 5d795c1a..8c187eea 100644 --- a/web/static/forms/form_login.jsp +++ b/web/static/forms/form_login.jsp @@ -18,7 +18,7 @@ Kundennummer:
- +
@@ -29,7 +29,7 @@ Passwort:
- +
@@ -38,8 +38,8 @@
- - + +
diff --git a/web/static/gender_selection_box.jsp b/web/static/gender_selection_box.jsp index d761f48d..14ccaadc 100644 --- a/web/static/gender_selection_box.jsp +++ b/web/static/gender_selection_box.jsp @@ -15,7 +15,7 @@ PizzaApplication app = PizzaServiceApplication.getInstance(application); %> -> <% // "Walk" through all genders and output them for (final Gender gender : Gender.values()) { diff --git a/web/style.css b/web/style.css index 06d50a9b..7dd8fbdd 100644 --- a/web/style.css +++ b/web/style.css @@ -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 index 00000000..f3025a19 --- /dev/null +++ b/web/terms.jsp @@ -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"%> + + + + + + + <%=PizzaServiceApplication.MAIN_TITLE%> - Allgemeine Geschäftsbedingungen + + + +
+

<%=PizzaServiceApplication.MAIN_TITLE%> - Allgemeine Geschäftsbedingungen

+
+ + + +
+
+

Allgemeine Geschäftsbedingungen:

+
+ +
+
+
+ + + +