From 4d92f0447ae24522226bfe18a48341b7ffd09b9f Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Tue, 11 Feb 2014 18:43:38 +0100
Subject: [PATCH] Header und Footer editierbar gemacht
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Nötig, damit Sonderseiten wie die Startseite, oder das Impressum oder die
About-Seite die Spezial-Links im Header und/oder Footer todschalten können.
---
 src/main/webapp/WEB-INF/spring/tiles.xml        | 2 ++
 src/main/webapp/WEB-INF/templates/footer.jsp    | 8 ++++++++
 src/main/webapp/WEB-INF/templates/html5page.jsp | 6 ++----
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/templates/footer.jsp

diff --git a/src/main/webapp/WEB-INF/spring/tiles.xml b/src/main/webapp/WEB-INF/spring/tiles.xml
index da757274..03c04d7f 100644
--- a/src/main/webapp/WEB-INF/spring/tiles.xml
+++ b/src/main/webapp/WEB-INF/spring/tiles.xml
@@ -7,11 +7,13 @@
   <definition name="BASEPAGE" template="/WEB-INF/templates/html5page.jsp">
     <put-attribute name="title" value="TITLE IS MISSING" type="string"/>
     <put-attribute name="htmlhead" value="/WEB-INF/templates/html-head.jsp" type="template"/>
+    <put-attribute name="header" value="/WEB-INF/templates/header.jsp" type="template"/>
     <put-attribute name="breadcrumb" value="BREADCRUMB IS MISSING" type="string"/>
     <put-attribute name="maincontent" value="/WEB-INF/templates/maincontent.jsp" type="template"/>
     <put-attribute name="contentclass" value="menu" type="string"/>
     <put-attribute name="marginalcontent" value="/WEB-INF/templates/marginalcontent.jsp" type="template"/>
     <put-attribute name="navigation" value="/WEB-INF/templates/navigation.jsp" type="template"/>
+    <put-attribute name="footer" value="/WEB-INF/templates/footer.jsp" type="template"/>
   </definition>
 
   <definition name="NOMENU" extends="BASEPAGE">
diff --git a/src/main/webapp/WEB-INF/templates/footer.jsp b/src/main/webapp/WEB-INF/templates/footer.jsp
new file mode 100644
index 00000000..25d4ea3a
--- /dev/null
+++ b/src/main/webapp/WEB-INF/templates/footer.jsp
@@ -0,0 +1,8 @@
+<%@page contentType="text/html;charset=UTF-8"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page session="false" %>
+<%@taglib uri="http://www.springframework.org/tags" prefix="s"%>
+<s:url var="base" value="/" />
+<li class="f" id="copyright">© <strong>mo</strong> 2013</li>
+<li class="f"><a class="f" href="${base}contact.html">Contact</a></li>
+<li class="f"><a class="f" href="${base}impressum.html">Impressum</a></li>
diff --git a/src/main/webapp/WEB-INF/templates/html5page.jsp b/src/main/webapp/WEB-INF/templates/html5page.jsp
index 1ccd625a..e15516e7 100644
--- a/src/main/webapp/WEB-INF/templates/html5page.jsp
+++ b/src/main/webapp/WEB-INF/templates/html5page.jsp
@@ -15,7 +15,7 @@
     <a id="top"></a>
     <div id="page" class="cf">
       <header id="header">
-        <h1 id="logo"><a href="${base}index.html" title="Home" class="l">juplo</a></h1>
+        <t:insertAttribute name="header"/>
         <span id="slogan"><strong>Java</strong> bits from nerds for nerds</span>
         <hr class="h" />
       </header>
@@ -46,9 +46,7 @@
       <footer id="footer">
         <hr class="f" />
         <ul id="footerlinks">
-          <li class="f" id="copyright">© <strong>mo</strong> 2013</li>
-          <li class="f"><a class="f" href="${base}contact.html">Contact</a></li>
-          <li class="f"><a class="f" href="${base}impressum.html">Impressum</a></li>
+          <t:insertAttribute name="footer"/>
         </ul>
       </footer>
     </div>
-- 
2.20.1