From 1760a8ec11406fc4037acccd300ea5d5bb7d6c64 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 28 Aug 2015 11:16:36 +0200 Subject: [PATCH] =?utf8?q?Migration=20to=20JSF=20continued:=20-=20used=20l?= =?utf8?q?esser=20scriptlets=20where=20possible,=20e.g.:=20-=20<%=3Dreques?= =?utf8?q?t.getContextPath()%>=20can=20be=20converted=20to=20${pageContext?= =?utf8?q?.request.contextPath}=20-=20after=20that,=20set=20it=20with=20=20-?= =?utf8?q?=20then=20you=20can=20use=20it:=20${basePath}=20Signed-off-by:Ro?= =?utf8?q?land=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- web/admin/category.jsp | 2 +- web/admin/index.jsp | 5 ++++- web/admin/product.jsp | 18 ++++++++++-------- web/errorHandler.jsp | 5 ++++- web/form_handler/add_item.jsp | 5 ++++- web/form_handler/admin/do_category.jsp | 5 ++++- web/form_handler/admin/do_product.jsp | 5 ++++- web/imprint.jsp | 5 ++++- web/index.jsp | 9 ++++++--- web/privacy.jsp | 4 +++- .../admin/admin_category_selection_box.jsp | 2 +- web/static/admin/admin_footer.jsp | 6 +++++- web/static/admin/admin_menu.jsp | 13 ++++++++----- .../admin_parent_category_selection_box.jsp | 2 +- web/static/forms/form_login.jsp | 6 +++++- web/static/gender_selection_box.jsp | 2 +- web/static/guest/guest_footer.jsp | 12 ++++++++---- web/static/guest/guest_menu.jsp | 14 +++++++++----- web/terms.jsp | 4 +++- 19 files changed, 85 insertions(+), 39 deletions(-) diff --git a/web/admin/category.jsp b/web/admin/category.jsp index 03817a13..3742aa13 100644 --- a/web/admin/category.jsp +++ b/web/admin/category.jsp @@ -4,13 +4,13 @@ Author : Roland Haeder --%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%--<%@page errorPage="errorHandler.jsp" %>--%> <%@page import="org.mxchange.pizzaapplication.category.Category"%> <%@page import="org.mxchange.pizzaapplication.database.frontend.category.CategoryFrontend"%> <%@page import="org.mxchange.pizzaapplication.beans.PizzaServiceBean"%> <%@page import="org.mxchange.pizzaapplication.beans.PizzaBean"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/web/admin/index.jsp b/web/admin/index.jsp index d60e08de..0983d611 100644 --- a/web/admin/index.jsp +++ b/web/admin/index.jsp @@ -13,11 +13,14 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + - + Pizza-Service - Administration diff --git a/web/admin/product.jsp b/web/admin/product.jsp index 399fe98f..09b79b4e 100644 --- a/web/admin/product.jsp +++ b/web/admin/product.jsp @@ -16,11 +16,13 @@ <%@page import="org.mxchange.pizzaapplication.database.frontend.product.ProductFrontend"%> + + - + Pizza-Service - Produkte @@ -40,7 +42,7 @@
-
+ @@ -63,17 +65,17 @@ - +
- ${product.getItemId()}: - + ${product.itemId}: + - ${product.getTitle()} + ${product.title} - ${product.getPrice()} + ${product.price} ${app.getPrintableProduktCategory(product)} @@ -96,7 +98,7 @@
- +
Neues Produkt hinzufügen: diff --git a/web/errorHandler.jsp b/web/errorHandler.jsp index 059399fd..feffab16 100644 --- a/web/errorHandler.jsp +++ b/web/errorHandler.jsp @@ -11,11 +11,14 @@ <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + - + Pizza-Service - Fehler diff --git a/web/form_handler/add_item.jsp b/web/form_handler/add_item.jsp index d5638079..3362d09e 100644 --- a/web/form_handler/add_item.jsp +++ b/web/form_handler/add_item.jsp @@ -20,6 +20,9 @@ +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + <% // Get amount from item Long amount = item.getAmount(); @@ -41,7 +44,7 @@ - + Pizza-Service - Form-Handler diff --git a/web/form_handler/admin/do_category.jsp b/web/form_handler/admin/do_category.jsp index c4cf37df..978c8d45 100644 --- a/web/form_handler/admin/do_category.jsp +++ b/web/form_handler/admin/do_category.jsp @@ -13,6 +13,9 @@ <%@page import="org.mxchange.pizzaapplication.exceptions.CategoryTitleAlreadyUsedException"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + <% // Handle forms controller.doAdminHandleCategoryForms(request, response); @@ -22,7 +25,7 @@ - + Pizza-Service - Form-Handler diff --git a/web/form_handler/admin/do_product.jsp b/web/form_handler/admin/do_product.jsp index d912531b..41547124 100644 --- a/web/form_handler/admin/do_product.jsp +++ b/web/form_handler/admin/do_product.jsp @@ -12,6 +12,9 @@ <%@page import="org.mxchange.pizzaapplication.product.Product"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + <% // Handle forms controller.doAdminHandleProductForms(request, response); @@ -21,7 +24,7 @@ - + Pizza-Service - Form-Handler diff --git a/web/imprint.jsp b/web/imprint.jsp index cd0acdb2..34730dbd 100644 --- a/web/imprint.jsp +++ b/web/imprint.jsp @@ -7,11 +7,14 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="org.mxchange.pizzaapplication.beans.PizzaServiceBean"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + - + Pizza-Service - Impressum diff --git a/web/index.jsp b/web/index.jsp index 6a540763..0a33ffc5 100644 --- a/web/index.jsp +++ b/web/index.jsp @@ -14,10 +14,13 @@ <%@page import="org.mxchange.pizzaapplication.item.basket.BasketItem"%> <%@page import="org.mxchange.pizzaapplication.item.AddableBasketItem"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@taglib prefix="basket" uri="http://mxchange.org/pizza-service/tags/basket" %> + + <%controller.init();%> @@ -26,7 +29,7 @@ - + Pizza-Service - Willkommen @@ -90,7 +93,7 @@
- Warenkorb + Warenkorb <%=item.getAmount()%> @@ -109,7 +112,7 @@ continue; } %> - + diff --git a/web/privacy.jsp b/web/privacy.jsp index 00c02e3a..0fc80f75 100644 --- a/web/privacy.jsp +++ b/web/privacy.jsp @@ -8,11 +8,13 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page import="org.mxchange.pizzaapplication.beans.PizzaServiceBean"%> + + - + Pizza-Service - Datenschutzbestimmungen diff --git a/web/static/admin/admin_category_selection_box.jsp b/web/static/admin/admin_category_selection_box.jsp index 5d7672b2..52a0d335 100644 --- a/web/static/admin/admin_category_selection_box.jsp +++ b/web/static/admin/admin_category_selection_box.jsp @@ -11,7 +11,7 @@ diff --git a/web/static/admin/admin_footer.jsp b/web/static/admin/admin_footer.jsp index 8b0c30c5..aa6b21b9 100644 --- a/web/static/admin/admin_footer.jsp +++ b/web/static/admin/admin_footer.jsp @@ -3,9 +3,13 @@ Created on : 11.08.2015, 12:28:03 Author : Roland Haeder --%> + +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + +
diff --git a/web/static/admin/admin_menu.jsp b/web/static/admin/admin_menu.jsp index 142f8285..92504285 100644 --- a/web/static/admin/admin_menu.jsp +++ b/web/static/admin/admin_menu.jsp @@ -4,15 +4,18 @@ Author : Roland Haeder --%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + diff --git a/web/static/admin/admin_parent_category_selection_box.jsp b/web/static/admin/admin_parent_category_selection_box.jsp index 845dcae4..7d118ec9 100644 --- a/web/static/admin/admin_parent_category_selection_box.jsp +++ b/web/static/admin/admin_parent_category_selection_box.jsp @@ -12,7 +12,7 @@ diff --git a/web/static/forms/form_login.jsp b/web/static/forms/form_login.jsp index 8c187eea..61b8c459 100644 --- a/web/static/forms/form_login.jsp +++ b/web/static/forms/form_login.jsp @@ -3,8 +3,12 @@ Created on : 11.08.2015, 12:28:03 Author : Roland Haeder --%> + +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + +
- +
Bitte geben Sie Ihre Kundennummer und Passwort ein: diff --git a/web/static/gender_selection_box.jsp b/web/static/gender_selection_box.jsp index 09379be6..e453adb5 100644 --- a/web/static/gender_selection_box.jsp +++ b/web/static/gender_selection_box.jsp @@ -8,7 +8,7 @@ <%@page import="org.mxchange.pizzaapplication.beans.PizzaBean"%> <%@page import="org.mxchange.pizzaapplication.beans.customer.CustomerBean" %> - +