From fdebe023ff751a191d3b6dff9fced1c305e4b1d9 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Wed, 8 May 2019 23:01:26 +0200
Subject: [PATCH] WIP: title/main/marginal explizit

---
 dist/about.html            |  9 +++++++--
 dist/impressum.html        | 10 ++++++++--
 dist/index.html            | 10 ++++++++--
 dist/templates/layout.html |  8 ++++----
 4 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/dist/about.html b/dist/about.html
index cfc4ed19..f5c7e49c 100644
--- a/dist/about.html
+++ b/dist/about.html
@@ -1,10 +1,15 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/about.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/about.html',
+      title='About',
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}
+      )}"
     >
   <head>
-    <title id="title">About</title>
+    <titl>About</title>
     <!--/*-->
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="stylesheet" type="text/css" href="css/base.css"/>
diff --git a/dist/impressum.html b/dist/impressum.html
index 3cf77556..cab80c0f 100644
--- a/dist/impressum.html
+++ b/dist/impressum.html
@@ -1,10 +1,16 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/impressum.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/impressum.html',
+      contentclass='nomenu',
+      title='Impressum',
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}
+      )}"
     >
   <head>
-    <title id="title">Impressum</title>
+    <title>Impressum</title>
     <!--/*-->
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="stylesheet" type="text/css" href="css/base.css"/>
diff --git a/dist/index.html b/dist/index.html
index d01d494b..97c13d48 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -1,10 +1,16 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/index.html', contentclass='nomenu')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/index.html',
+      contentclass='nomenu',
+      title='Home',
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}
+      )}"
     >
   <head>
-    <title id="title">Home</title>
+    <title>Home</title>
     <!--/*-->
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="stylesheet" type="text/css" href="css/base.css"/>
diff --git a/dist/templates/layout.html b/dist/templates/layout.html
index 752d2548..e769d051 100644
--- a/dist/templates/layout.html
+++ b/dist/templates/layout.html
@@ -2,11 +2,11 @@
 <html
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:th="http://www.thymeleaf.org"
-    th:fragment="layout(uri)"
+    th:fragment="layout(uri,maincontent,marginalcontent)"
     thymeproxy:variables="SET:sitemap.json"
     >
   <head>
-    <title th:replace="~{::#title}">juplo - BASISTEMPLATE</title>
+    <title th:text="${title}">juplo - BASISTEMPLATE</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <!-- Default / Responsive -->
@@ -66,7 +66,7 @@
         <hr class="b" />
       </div>
       <main class="content cf">
-        <article id="content" class="main" th:include="~{::.maincontent}">
+        <article id="content" class="main" th:include="${maincontent}">
           <header><h1 th:include="${title}">juplo - BASISTEMPLATE</h1></header>
           <div th:fragment="maincontent">
             <p>
@@ -189,7 +189,7 @@
             </ul>
             <hr class="n"/>
           </nav>
-          <aside class="m" th:insert="~{::.marginalcontent}?:~{}">
+          <aside class="m" th:insert="${marginalcontent}?:~{}">
           <!--/* the following  is only visible during natural templating -->
             <h1>Other nasty but marginal stuff</h1>
             <p>
-- 
2.20.1

