Moved includes in proper sub folders + renamed them according "access group"

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/web/admin/category.jsp b/web/admin/category.jsp
index 53b7ebb2323a0fb4f271c9b1c22002a2207214da..c34277d3a0fe124a2d08c86f9b0ada924759bb2c 100644 (file)
--- a/web/admin/category.jsp
+++ b/web/admin/category.jsp
@@ -32,7 +32,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/menu.jsp" flush="false" />
+               <jsp:include page="/static/admin/admin_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -113,7 +113,7 @@
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <jsp:include flush="false" page="/static/admin/parent_category_selection_box.jsp" />
+                                                                       <jsp:include flush="false" page="/static/admin/admin_parent_category_selection_box.jsp" />
                                                                </div>
 
                                                                <div class="clear"></div>
@@ -130,6 +130,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/footer.jsp" flush="false" />
+               <jsp:include page="/static/admin/admin_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/admin/index.jsp b/web/admin/index.jsp
index df4969ee08d6a3f2e08e336eacf30dc784e66735..933a03104720c1bd845aa0f3a6aef32eabe43bcd 100644 (file)
--- a/web/admin/index.jsp
+++ b/web/admin/index.jsp
@@ -31,7 +31,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/menu.jsp" flush="false" />
+               <jsp:include page="/static/admin/admin_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -43,6 +43,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/footer.jsp" flush="false" />
+               <jsp:include page="/static/admin/admin_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/admin/product.jsp b/web/admin/product.jsp
index 3cd489e2d60da7350f1a034f161b85de1f18da64..e3515583b4008091602b08c75bdfaccda9379980 100644 (file)
--- a/web/admin/product.jsp
+++ b/web/admin/product.jsp
@@ -34,7 +34,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/menu.jsp" flush="false" />
+               <jsp:include page="/static/admin/admin_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -140,7 +140,7 @@
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <jsp:include flush="false" page="/static/admin/category_selection_box.jsp" />
+                                                                       <jsp:include flush="false" page="/static/admin/admin_category_selection_box.jsp" />
                                                                </div>
 
                                                                <div class="clear"></div>
@@ -178,6 +178,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/footer.jsp" flush="false" />
+               <jsp:include page="/static/admin/admin_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/bye.jsp b/web/bye.jsp
index c4ec492148579b22a4ad82f00dc93605209e1c05..c9bbd00baa351c3f4ce70af9b3af4de5272f7fdc 100644 (file)
--- a/web/bye.jsp
+++ b/web/bye.jsp
@@ -22,7 +22,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -45,6 +45,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/customer/login.jsp b/web/customer/login.jsp
index ed349fdef11769f258559532deb60de48822129d..48bcd46273d74bde1eb0de2f55f435b1a49ba7ab 100644 (file)
--- a/web/customer/login.jsp
+++ b/web/customer/login.jsp
@@ -23,7 +23,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -45,6 +45,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/customer/lost_passwd.jsp b/web/customer/lost_passwd.jsp
index 37813f7abdfbd5734ad4175ea4dce324f7357a1c..b242e882d6eabe1595f7bd32d1aa1a0f23c0d01f 100644 (file)
--- a/web/customer/lost_passwd.jsp
+++ b/web/customer/lost_passwd.jsp
@@ -23,7 +23,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -85,6 +85,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/customer/register.jsp b/web/customer/register.jsp
index 7b40113b137d3dd753d43c35dfd8d0aae84de09d..c3f999e3d9cfb5efc1701243f5e2f3e2e4f39e6e 100644 (file)
--- a/web/customer/register.jsp
+++ b/web/customer/register.jsp
@@ -25,7 +25,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -283,6 +283,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/errorHandler.jsp b/web/errorHandler.jsp
index 6bb7e636a1c00f8dae2cc6d49b3e3c9617e2962c..9f7dbdbf42c91dd774cdf265e839b5460508cf78 100644 (file)
--- a/web/errorHandler.jsp
+++ b/web/errorHandler.jsp
@@ -26,7 +26,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -46,6 +46,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/form_handler/add_item.jsp b/web/form_handler/add_item.jsp
index 9c06926211fc600ce2eb1892e8f1d39a217bbad4..e3451d0629e1a373e14660d6ebfca5daa21b538b 100644 (file)
--- a/web/form_handler/add_item.jsp
+++ b/web/form_handler/add_item.jsp
@@ -46,10 +46,10 @@
                        <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler</h1>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <jsp:include page="/static/error/direct_call.jsp" flush="false" />
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/form_handler/admin/do_category.jsp b/web/form_handler/admin/do_category.jsp
index 40f23f91d66461249449dcd1d7ee14d5f36eef73..8c54f09617a463f988336171ba5ff21600ca195f 100644 (file)
--- a/web/form_handler/admin/do_category.jsp
+++ b/web/form_handler/admin/do_category.jsp
@@ -33,7 +33,7 @@
                        <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler</h1>
                </div>
 
-               <jsp:include page="/static/admin/menu.jsp" flush="false" />
+               <jsp:include page="/static/admin/admin_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">

diff --git a/web/form_handler/admin/do_product.jsp b/web/form_handler/admin/do_product.jsp
index d6be5ce7ce63efcb9ec7d42fc79685e3aa874d31..4631e09f91c0922a666b280d87ec2136ffb97014 100644 (file)
--- a/web/form_handler/admin/do_product.jsp
+++ b/web/form_handler/admin/do_product.jsp
@@ -32,7 +32,7 @@
                        <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler</h1>
                </div>
 
-               <jsp:include page="/static/admin/menu.jsp" flush="false" />
+               <jsp:include page="/static/admin/admin_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">

diff --git a/web/form_handler/do_order.jsp b/web/form_handler/do_order.jsp
index 503e9ede684cef14324663c30455937e049d2270..1b54e633decfb482d24cd864e32acdbb052be170 100644 (file)
--- a/web/form_handler/do_order.jsp
+++ b/web/form_handler/do_order.jsp
@@ -46,7 +46,7 @@
                        <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler</h1>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <jsp:include page="/static/error/direct_call.jsp" flush="false" />
        </body>

diff --git a/web/form_handler/do_preview.jsp b/web/form_handler/do_preview.jsp
index 6eebc903af4f0af0ae6b5204eac5651b1b64498a..14657f6924c4d99ef4aa16a331c30109ecf308c2 100644 (file)
--- a/web/form_handler/do_preview.jsp
+++ b/web/form_handler/do_preview.jsp
@@ -64,7 +64,7 @@
                        <h1><%=PizzaServiceApplication.MAIN_TITLE%> - Form-Handler</h1>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <jsp:include page="/static/error/direct_call.jsp" flush="false" />
        </body>

diff --git a/web/imprint.jsp b/web/imprint.jsp
index b1643a6edaa6b51b91f55d3103a8c74b2c921ae7..8a5e7ed4e1837dc8f2d138a27c53a9986363c054 100644 (file)
--- a/web/imprint.jsp
+++ b/web/imprint.jsp
@@ -22,7 +22,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -33,6 +33,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/index.jsp b/web/index.jsp
index 37824419eaa74e2785cb269c4ddd6583697b407c..e6b2b617561b63fa8112475b448e4f05b1212860 100644 (file)
--- a/web/index.jsp
+++ b/web/index.jsp
@@ -36,7 +36,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -134,6 +134,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/privacy.jsp b/web/privacy.jsp
index b62b9fe678cda035cba13445e977562ba3026e34..9ed1ddffe6c545bbdfa0642516073a2d246b01cb 100644 (file)
--- a/web/privacy.jsp
+++ b/web/privacy.jsp
@@ -23,7 +23,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -34,6 +34,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/static/admin/admin_category_selection_box.jsp b/web/static/admin/admin_category_selection_box.jsp
new file mode 100644 (file)
index 0000000..9eac81d
--- /dev/null
+++ b/web/static/admin/admin_category_selection_box.jsp
@@ -0,0 +1,21 @@
+<%-- 
+       Document   : admin_category_selection_box
+       Created on : 14.08.2015, 12:51:05
+       Author     : Roland Haeder
+--%>
+
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@page import="org.mxchange.pizzaapplication.database.category.PizzaCategoryDatabaseConstants"%>
+<%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%>
+<%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%>
+
+<%
+       // Init application instance
+       PizzaApplication app = PizzaServiceApplication.getInstance(application);
+%>
+
+<select class="select" name="category" size="1">
+       <c:forEach var="category" items="<%=app.getCategories()%>">
+               <option value="${category.getId()}">${category.decodedTitle()}</option>
+       </c:forEach>
+</select>

diff --git a/web/static/admin/admin_footer.jsp b/web/static/admin/admin_footer.jsp
new file mode 100644 (file)
index 0000000..8b0c30c
--- /dev/null
+++ b/web/static/admin/admin_footer.jsp
@@ -0,0 +1,12 @@
+<%-- 
+       Document   : admin_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/admin/admin_menu.jsp b/web/static/admin/admin_menu.jsp
new file mode 100644 (file)
index 0000000..142f828
--- /dev/null
+++ b/web/static/admin/admin_menu.jsp
@@ -0,0 +1,18 @@
+<%-- 
+       Document   : admin_menu
+       Created on : 06.08.2015, 12:41:44
+       Author     : Roland Haeder
+--%>
+
+<div id="menu">
+       <ul>
+               <li><a href="<%=request.getContextPath()%>/admin/" title="Eingangsseite">Home</a></li>
+               <li><a href="<%=request.getContextPath()%>/admin/category.jsp" title="Kazegorie">Kategorie</a></li>
+               <li><a href="<%=request.getContextPath()%>/admin/product.jsp" title="Produkt">Produkt</a></li>
+       </ul>
+
+       <ul>
+               <li><a href="<%=request.getContextPath()%>/admin/logout.jsp" title="Ausloggen">Ausloggen</a></li>
+               <li><a href="<%=request.getContextPath()%>/" title="Zur Webseite, aber eingeloggt bleiben">Webseite aufrufen</a></li>
+       </ul>
+</div>

diff --git a/web/static/admin/admin_parent_category_selection_box.jsp b/web/static/admin/admin_parent_category_selection_box.jsp
new file mode 100644 (file)
index 0000000..d041263
--- /dev/null
+++ b/web/static/admin/admin_parent_category_selection_box.jsp
@@ -0,0 +1,22 @@
+<%-- 
+       Document   : admin_parent_category_selection_box
+       Created on : 14.08.2015, 12:51:05
+       Author     : Roland Haeder
+--%>
+
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@page import="org.mxchange.pizzaapplication.database.category.PizzaCategoryDatabaseConstants"%>
+<%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%>
+<%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%>
+
+<%
+       // Init application instance
+       PizzaApplication app = PizzaServiceApplication.getInstance(application);
+%>
+
+<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>
+       </c:forEach>
+</select>

diff --git a/web/static/admin/category_selection_box.jsp b/web/static/admin/category_selection_box.jsp
deleted file mode 100644 (file)
index ff55de6..0000000
--- a/web/static/admin/category_selection_box.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%-- 
-       Document   : parent_category_selection_box
-       Created on : 14.08.2015, 12:51:05
-       Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@page import="org.mxchange.pizzaapplication.database.category.PizzaCategoryDatabaseConstants"%>
-<%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%>
-<%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%>
-
-<%
-       // Init application instance
-       PizzaApplication app = PizzaServiceApplication.getInstance(application);
-%>
-
-<select class="select" name="category" size="1">
-       <c:forEach var="category" items="<%=app.getCategories()%>">
-               <option value="${category.getId()}">${category.decodedTitle()}</option>
-       </c:forEach>
-</select>

diff --git a/web/static/admin/footer.jsp b/web/static/admin/footer.jsp
deleted file mode 100644 (file)
index ca2fcca..0000000
--- a/web/static/admin/footer.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%-- 
-       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/admin/menu.jsp b/web/static/admin/menu.jsp
deleted file mode 100644 (file)
index 2f574f4..0000000
--- a/web/static/admin/menu.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%-- 
-       Document   : menu
-       Created on : 06.08.2015, 12:41:44
-       Author     : Roland Haeder
---%>
-
-<div id="menu">
-       <ul>
-               <li><a href="<%=request.getContextPath()%>/admin/" title="Eingangsseite">Home</a></li>
-               <li><a href="<%=request.getContextPath()%>/admin/category.jsp" title="Kazegorie">Kategorie</a></li>
-               <li><a href="<%=request.getContextPath()%>/admin/product.jsp" title="Produkt">Produkt</a></li>
-       </ul>
-
-       <ul>
-               <li><a href="<%=request.getContextPath()%>/admin/logout.jsp" title="Ausloggen">Ausloggen</a></li>
-               <li><a href="<%=request.getContextPath()%>/" title="Zur Webseite, aber eingeloggt bleiben">Webseite aufrufen</a></li>
-       </ul>
-</div>

diff --git a/web/static/admin/parent_category_selection_box.jsp b/web/static/admin/parent_category_selection_box.jsp
deleted file mode 100644 (file)
index ed7d6fe..0000000
--- a/web/static/admin/parent_category_selection_box.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%-- 
-       Document   : parent_category_selection_box
-       Created on : 14.08.2015, 12:51:05
-       Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@page import="org.mxchange.pizzaapplication.database.category.PizzaCategoryDatabaseConstants"%>
-<%@page import="org.mxchange.pizzaapplication.application.PizzaServiceApplication"%>
-<%@page import="org.mxchange.pizzaapplication.application.PizzaApplication"%>
-
-<%
-       // Init application instance
-       PizzaApplication app = PizzaServiceApplication.getInstance(application);
-%>
-
-<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>
-       </c:forEach>
-</select>

diff --git a/web/static/footer.jsp b/web/static/footer.jsp
deleted file mode 100644 (file)
index 597af56..0000000
--- a/web/static/footer.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%-- 
-       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()%>/">Home</a></li>
-               <li><a href="<%=request.getContextPath()%>/imprint.jsp">Impressum</a></li>
-               <li><a href="<%=request.getContextPath()%>/terms.jsp">AGBs</a></li>
-               <li><a href="<%=request.getContextPath()%>/privacy.jsp">Datenschutz</a></li>
-       </ul>
-</div>
-
-<div class="clear"></div>

diff --git a/web/static/guest/guest_footer.jsp b/web/static/guest/guest_footer.jsp
new file mode 100644 (file)
index 0000000..597af56
--- /dev/null
+++ b/web/static/guest/guest_footer.jsp
@@ -0,0 +1,15 @@
+<%-- 
+       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()%>/">Home</a></li>
+               <li><a href="<%=request.getContextPath()%>/imprint.jsp">Impressum</a></li>
+               <li><a href="<%=request.getContextPath()%>/terms.jsp">AGBs</a></li>
+               <li><a href="<%=request.getContextPath()%>/privacy.jsp">Datenschutz</a></li>
+       </ul>
+</div>
+
+<div class="clear"></div>

diff --git a/web/static/guest/guest_menu.jsp b/web/static/guest/guest_menu.jsp
new file mode 100644 (file)
index 0000000..b2c8174
--- /dev/null
+++ b/web/static/guest/guest_menu.jsp
@@ -0,0 +1,18 @@
+<%-- 
+       Document   : guest_menu
+       Created on : 06.08.2015, 12:41:44
+       Author     : Roland Haeder
+--%>
+
+<div id="menu">
+       <ul>
+               <li><a href="<%=request.getContextPath()%>/" title="Eingangsseite">Home</a></li>
+               <li><a href="<%=request.getContextPath()%>/bye.jsp" title="Sitzung beennden">Sitzung beenden</a></li>
+       </ul>
+
+       <ul>
+               <li><a href="<%=request.getContextPath()%>/customer/login.jsp" title="Login für bestehende Kunden">Einloggen</a></li>
+               <li><a href="<%=request.getContextPath()%>/customer/register.jsp" title="Anmeldung als neuer Kunde">Neuer Kunde</a></li>
+               <li><a href="<%=request.getContextPath()%>/customer/lost_passwd.jsp" title="Neues Passwort erstellen">Passwort vergessen?</a></li>
+       </ul>
+</div>

diff --git a/web/static/menu.jsp b/web/static/menu.jsp
deleted file mode 100644 (file)
index a1d6850..0000000
--- a/web/static/menu.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%-- 
-       Document   : menu
-       Created on : 06.08.2015, 12:41:44
-       Author     : Roland Haeder
---%>
-
-<div id="menu">
-       <ul>
-               <li><a href="<%=request.getContextPath()%>/" title="Eingangsseite">Home</a></li>
-               <li><a href="<%=request.getContextPath()%>/bye.jsp" title="Sitzung beennden">Sitzung beenden</a></li>
-       </ul>
-
-       <ul>
-               <li><a href="<%=request.getContextPath()%>/customer/login.jsp" title="Login für bestehende Kunden">Einloggen</a></li>
-               <li><a href="<%=request.getContextPath()%>/customer/register.jsp" title="Anmeldung als neuer Kunde">Neuer Kunde</a></li>
-               <li><a href="<%=request.getContextPath()%>/customer/lost_passwd.jsp" title="Neues Passwort erstellen">Passwort vergessen?</a></li>
-       </ul>
-</div>

diff --git a/web/terms.jsp b/web/terms.jsp
index 1a14709ca68fcece18dfc19275f5ac57bd461f2d..506e7f89d736c38d63b77d4539048978e5d2902a 100644 (file)
--- a/web/terms.jsp
+++ b/web/terms.jsp
@@ -23,7 +23,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/menu.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -34,6 +34,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/footer.jsp" flush="false" />
+               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>