]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
projects / pizzaservice-war.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8bf8b88)
Towards JSF without JSP includes ... ;-)
authorRoland Haeder <roland@mxchange.org>
Wed, 2 Sep 2015 16:54:30 +0000 (18:54 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 2 Sep 2015 16:54:30 +0000 (18:54 +0200)
Signed-off-by:Roland Häder <roland@mxchange.org>

web/imprint.xhtml patch | blob | history
web/privacy.xhtml patch | blob | history
web/static/guest/guest_footer.jsp [deleted file] patch | blob | history
web/static/guest/guest_menu.jsp [deleted file] patch | blob | history
web/templates.dist/guest_page.xhtml patch | blob | history
web/terms.xhtml patch | blob | history

diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index 5c066f68b9cb0734bc1f78d9e86c05d2ad237809..be755270729c427f05ac7550c6708252e69c94b8 100644 (file)
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -1,41 +1,29 @@
-<%-- 
-       Document   : login
-       Created on : 11.08.2015, 11:35:53
-       Author     : Roland Haeder
---%>
-
-<%--<%@page errorPage="errorHandler.jsp" %>--%>
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
+<?xml version='1.0' encoding='UTF-8' ?>
 <!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="${basePath}/style.css" type="text/css" />
-               <title>Pizza-Service - Impressum</title>
-       </head>
-
-       <body>
-               <div id="header"> 
-                       <div id="title">
-                               <h1>Pizza-Service - Impressum</h1>
-                       </div>
-               </div>
-
-               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
-
-               <div id="content_outer">
-                       <div id="content_title">
-                               <h2>Impressum:</h2>
-                       </div>
-
-                       <div id="content">
-                       </div>
-               </div>
-
-               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
-       </body>
+<html xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/base.tpl">
+               <ui:define name="title">Impressum</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       Impressum
+               </ui:define>
+
+               <ui:define name="content">
+                       Hier kommt das Impressum hin!
+               </ui:define>
+
+               <ui:define name="footer">
+                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+               </ui:define>
+       </ui:composition>
 </html>
diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index e385c0906e6d567b43410a2ea02a55559015a39b..0dc63b1847dcad663e50bf9838d6e2b58fcbf7ca 100644 (file)
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -1,41 +1,29 @@
-<%-- 
-       Document   : privacy
-       Created on : 11.08.2015, 11:56:22
-       Author     : Roland Haeder
---%>
-
-<%--<%@page errorPage="errorHandler.jsp" %>--%>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
+<?xml version='1.0' encoding='UTF-8' ?>
 <!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="${basePath}/style.css" type="text/css" />
-               <title>Pizza-Service - Datenschutzbestimmungen</title>
-       </head>
-
-       <body>
-               <div id="header"> 
-                       <div id="title">
-                               <h1>Pizza-Service - Datenschutzbestimmungen</h1>
-                       </div>
-               </div>
-
-               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
-
-               <div id="content_outer">
-                       <div id="content_title">
-                               <h2>Datenschutzbestimmungen:</h2>
-                       </div>
-
-                       <div id="content">
-                       </div>
-               </div>
-
-               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
-       </body>
+<html xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/base.tpl">
+               <ui:define name="title">Datenschutzbestimmungen</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       Datenschutzbestimmungen
+               </ui:define>
+
+               <ui:define name="content">
+                       Hier kommen die Datenschutzbestimmungen hin.
+               </ui:define>
+
+               <ui:define name="footer">
+                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+               </ui:define>
+       </ui:composition>
 </html>
diff --git a/web/static/guest/guest_footer.jsp b/web/static/guest/guest_footer.jsp
deleted file mode 100644 (file)
index 4cad7d3..0000000
--- a/web/static/guest/guest_footer.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%-- 
-       Document   : footer
-       Created on : 11.08.2015, 12:28:03
-       Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
-<div class="footer">
-       <ul class="footer_nav">
-               <li><a href="${basePath}/">Home</a></li>
-               <li><a href="${basePath}/imprint.jsp">Impressum</a></li>
-               <li><a href="${basePath}/terms.jsp">AGBs</a></li>
-               <li><a href="${basePath}/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
deleted file mode 100644 (file)
index 2355163..0000000
--- a/web/static/guest/guest_menu.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%-- 
-       Document   : guest_menu
-       Created on : 06.08.2015, 12:41:44
-       Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
-<div id="menu">
-       <ul>
-               <li><a href="${basePath}/" title="Eingangsseite">Home</a></li>
-               <li><a href="${basePath}/basket.jsp" title="Zum Warenkorb">Zum Warenkorb</a></li>
-               <li><a href="${basePath}/bye.jsp" title="Sitzung beennden">Sitzung beenden</a></li>
-       </ul>
-
-       <ul>
-               <li><a href="${basePath}/customer/login.jsp" title="Login für bestehende Kunden">Einloggen</a></li>
-               <li><a href="${basePath}/customer/register.jsp" title="Anmeldung als neuer Kunde">Neuer Kunde</a></li>
-               <li><a href="${basePath}/customer/lost_passwd.jsp" title="Neues Passwort erstellen">Passwort vergessen?</a></li>
-       </ul>
-</div>
diff --git a/web/templates.dist/guest_page.xhtml b/web/templates.dist/guest_page.xhtml
index 7d67185246b147862db7d27d5b4a2136619c88f6..4577b9ae93b9ad7b946204da8f94b7b9231ff998 100644 (file)
--- a/web/templates.dist/guest_page.xhtml
+++ b/web/templates.dist/guest_page.xhtml
@@ -7,12 +7,6 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <f:metadata>
-               <f:viewAction action="#{controller.init()}" />
-       </f:metadata>
-
-       <c:set var="basePath" value="#{request.contextPath}" />
-
        <ui:composition template="/WEB-INF/templates/base.tpl">
                <ui:define name="title">Your page's title here</ui:define>
 
diff --git a/web/terms.xhtml b/web/terms.xhtml
index 1c365b35bcf3cceecc927ac7c93eaddc89b1602e..e1de7989ff7f0b346015fa41443614ec51c9e0da 100644 (file)
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -1,41 +1,29 @@
-<%-- 
-       Document   : privacy
-       Created on : 11.08.2015, 11:56:22
-       Author     : Roland Haeder
---%>
-
-<%--<%@page errorPage="errorHandler.jsp" %>--%>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
+<?xml version='1.0' encoding='UTF-8' ?>
 <!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="${basePath}/style.css" type="text/css" />
-               <title>Pizza-Service - Allgemeine Geschäftsbedingungen</title>
-       </head>
-
-       <body>
-               <div id="header"> 
-                       <div id="title">
-                               <h1>Pizza-Service - Allgemeine Geschäftsbedingungen</h1>
-                       </div>
-               </div>
-
-               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
-
-               <div id="content_outer">
-                       <div id="content_title">
-                               <h2>Allgemeine Geschäftsbedingungen:</h2>
-                       </div>
-
-                       <div id="content">
-                       </div>
-               </div>
-
-               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
-       </body>
+<html xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/base.tpl">
+               <ui:define name="title">Allgemeine Gesch&auml;ftsbedingungen</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       Allgemeine Gesch&auml;ftsbedingungen
+               </ui:define>
+
+               <ui:define name="content">
+                       Hier kommen die allgemeinen Gesch&auml;ftsbedingungen hin.
+               </ui:define>
+
+               <ui:define name="footer">
+                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+               </ui:define>
+       </ui:composition>
 </html>
Unnamed repository; edit this file 'description' to name the repository.