From b130e0338b37935e13e2c8eb3a46bcfc42884f75 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 18 Aug 2015 08:25:13 +0200
Subject: [PATCH] =?utf8?q?Added=20footer=20for=20admin=20area=20+=20error?=
 =?utf8?q?=20include=20file=20"direct=5Fcall.jsp"=20Signed-off-by:Roland?=
 =?utf8?q?=20H=C3=A4der=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 web/admin/category.jsp           |  2 ++
 web/admin/index.jsp              |  2 ++
 web/admin/product.jsp            |  2 ++
 web/form_handler/add_item.jsp    | 13 +++----------
 web/form_handler/do_order.jsp    | 12 ++----------
 web/form_handler/do_preview.jsp  | 10 +---------
 web/static/admin/footer.jsp      | 12 ++++++++++++
 web/static/error/direct_call.jsp | 14 ++++++++++++++
 web/static/footer.jsp            |  1 +
 9 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 web/static/admin/footer.jsp
 create mode 100644 web/static/error/direct_call.jsp

diff --git a/web/admin/category.jsp b/web/admin/category.jsp
index 1419c92a..4ebcc9a6 100644
--- a/web/admin/category.jsp
+++ b/web/admin/category.jsp
@@ -135,5 +135,7 @@
 				</div>
 			</div>
 		</div>
+
+		<jsp:include page="/static/admin/footer.jsp" flush="true" />
 	</body>
 </html>
diff --git a/web/admin/index.jsp b/web/admin/index.jsp
index d1dafc5a..c28f4f4c 100644
--- a/web/admin/index.jsp
+++ b/web/admin/index.jsp
@@ -42,5 +42,7 @@
 				Einiges kann hier eingestellt werden.
 			</div>
 		</div>
+
+		<jsp:include page="/static/admin/footer.jsp" flush="true" />
 	</body>
 </html>
diff --git a/web/admin/product.jsp b/web/admin/product.jsp
index 92b7dd56..4e9f0da8 100644
--- a/web/admin/product.jsp
+++ b/web/admin/product.jsp
@@ -177,5 +177,7 @@
 				</div>
 			</div>
 		</div>
+
+		<jsp:include page="/static/admin/footer.jsp" flush="true" />
 	</body>
 </html>
diff --git a/web/form_handler/add_item.jsp b/web/form_handler/add_item.jsp
index 7d9f761a..0fc27125 100644
--- a/web/form_handler/add_item.jsp
+++ b/web/form_handler/add_item.jsp
@@ -4,6 +4,7 @@
 	Author     : Roland Haeder
 --%>
 
+<%--<%@page errorPage="errorHandler.jsp" %>--%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%>
 <%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%>
@@ -32,16 +33,8 @@
 			<h1><%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler</h1>
 		</div>
 
-		<jsp:include page="/static/admin/menu.jsp" flush="true" />
+		<jsp:include page="/static/menu.jsp" flush="true" />
 
-		<div id="content_outer">
-			<div id="content_title">
-				<h2>Bitte nicht direkt aufrufen:</h2>
-			</div>
-
-			<div id="content">
-				Bitte rufen Sie diese Seite nicht direkt auf.
-			</div>
-		</div>
+		<jsp:include page="/static/error/direct_call.jsp" flush="true" />
 	</body>
 </html>
diff --git a/web/form_handler/do_order.jsp b/web/form_handler/do_order.jsp
index 7305c365..6afcf1f6 100644
--- a/web/form_handler/do_order.jsp
+++ b/web/form_handler/do_order.jsp
@@ -46,16 +46,8 @@
 			<h1><%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler</h1>
 		</div>
 
-		<jsp:include page="/static/admin/menu.jsp" flush="true" />
+		<jsp:include page="/static/menu.jsp" flush="true" />
 
-		<div id="content_outer">
-			<div id="content_title">
-				<h2>Bitte nicht direkt aufrufen:</h2>
-			</div>
-
-			<div id="content">
-				Bitte rufen Sie diese Seite nicht direkt auf.
-			</div>
-		</div>
+		<jsp:include page="/static/error/direct_call.jsp" flush="true" />
 	</body>
 </html>
diff --git a/web/form_handler/do_preview.jsp b/web/form_handler/do_preview.jsp
index 03e26d22..61c6cfdb 100644
--- a/web/form_handler/do_preview.jsp
+++ b/web/form_handler/do_preview.jsp
@@ -66,14 +66,6 @@
 
 		<jsp:include page="/static/menu.jsp" flush="true" />
 
-		<div id="content_outer">
-			<div id="content_title">
-				<h2>Bitte nicht direkt aufrufen:</h2>
-			</div>
-
-			<div id="content">
-				Bitte rufen Sie diese Seite nicht direkt auf.
-			</div>
-		</div>
+		<jsp:include page="/static/error/direct_call.jsp" flush="true" />
 	</body>
 </html>
diff --git a/web/static/admin/footer.jsp b/web/static/admin/footer.jsp
new file mode 100644
index 00000000..ca2fcca0
--- /dev/null
+++ b/web/static/admin/footer.jsp
@@ -0,0 +1,12 @@
+<%-- 
+	Document   : footer
+	Created on : 11.08.2015, 12:28:03
+	Author     : Roland Haeder
+--%>
+<div class="footer">
+	<ul class="footer_nav">
+		<li><a href="<%=request.getContextPath()%>/">Zur Webseite</a></li>
+	</ul>
+</div>
+
+<div class="clear"></div>
diff --git a/web/static/error/direct_call.jsp b/web/static/error/direct_call.jsp
new file mode 100644
index 00000000..37dab2c2
--- /dev/null
+++ b/web/static/error/direct_call.jsp
@@ -0,0 +1,14 @@
+<%-- 
+	Document   : direct_call
+	Created on : 11.08.2015, 12:28:03
+	Author     : Roland Haeder
+--%>
+<div id="content_outer">
+	<div id="content_title">
+		<h2>Bitte nicht direkt aufrufen:</h2>
+	</div>
+
+	<div id="content">
+		Bitte rufen Sie diese Seite nicht direkt auf.
+	</div>
+</div>
diff --git a/web/static/footer.jsp b/web/static/footer.jsp
index cf0e536d..597af563 100644
--- a/web/static/footer.jsp
+++ b/web/static/footer.jsp
@@ -11,4 +11,5 @@
 		<li><a href="<%=request.getContextPath()%>/privacy.jsp">Datenschutz</a></li>
 	</ul>
 </div>
+
 <div class="clear"></div>
-- 
2.39.5