Die Attribute title/main/marginal werden explizit gesetzt
authorKai Moritz <kai@juplo.de>
Wed, 8 May 2019 21:01:26 +0000 (23:01 +0200)
committerKai Moritz <kai@juplo.de>
Sun, 22 Nov 2020 16:14:52 +0000 (17:14 +0100)
Shell-Code, der für die Umformatierung verwendet wurde:
%<----------------------------
for i in `find -name '*.html'`
do
   sed -i -e's+layout\(.\)\(uri='\''[^'\'']*'\''\)+layout\1\n      \2,\n      title=~{:: title},\n      maincontent=~{:: .maincontent},\n      marginalcontent=~{:: .marginalcontent}+' $i
done
%<----------------------------

41 files changed:
dist/about.html
dist/agb.html
dist/blog/article.html
dist/blog/comments.html
dist/blog/index.html
dist/contact.html
dist/datenschutz.html
dist/expertise.html
dist/haftung-inhalte.html
dist/haftung-links.html
dist/impressum.html
dist/index.html
dist/potemkin/accelerator.html
dist/potemkin/fix-swf/getting-started.html
dist/potemkin/fix-swf/overview.html
dist/potemkin/html-experimente.html
dist/potemkin/html-experimente/basis-layout.html
dist/potemkin/html-experimente/breadcrumb.html
dist/potemkin/html-experimente/druck-layout.html
dist/potemkin/html-experimente/error.html
dist/potemkin/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html
dist/potemkin/html-experimente/fast-leer-einspaltig.html
dist/potemkin/html-experimente/fast-leer-kein-menü-aber-marginalinhalt.html
dist/potemkin/html-experimente/fast-leer-kein-menü.html
dist/potemkin/html-experimente/fast-leer-mit-menü-und-marginalinhalt.html
dist/potemkin/html-experimente/fast-leer-mit-menü.html
dist/potemkin/html-experimente/formulare.html
dist/potemkin/html-experimente/kein-layout.html
dist/potemkin/html-experimente/phone.html
dist/potemkin/html-experimente/seitenaufteilung.html
dist/potemkin/html-experimente/seitenkopf.html
dist/potemkin/html-experimente/symbole.html
dist/potemkin/html-experimente/tablet.html
dist/potemkin/html-experimente/tiny.html
dist/potemkin/typo.html
dist/projects.html
dist/references.html
dist/templates/404.html
dist/templates/error.html
dist/templates/layout.html
dist/urheberrechte.html

index cfc4ed1..442ce98 100644 (file)
@@ -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=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}
+      )}"
     >
   <head>
-    <title id="title">About</title>
+    <title>About</title>
     <!--/*-->
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="stylesheet" type="text/css" href="css/base.css"/>
index 9fd47cc..f7bf009 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/agb.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/agb.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent})}"
     >
   <head>
     <title id="title">Allgemeine Geschäftsbedingungen (AGB)</title>
index 8f9efec..6142711 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/blog/article.html', json='MERGE:/blog/blog.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/blog/article.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/blog/blog.json')}"
     >
   <head>
     <title id="title">juplo - blog - Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources</title>
index b0c055f..5f7316a 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/blog/comments.html', json='MERGE:/blog/blog.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/blog/comments.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/blog/blog.json')}"
     >
   <head>
     <title id="title">juplo - blog - hibernate4-maven-plugin</title>
index 9ea279a..287f577 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/blog/', json='MERGE:/blog/blog.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/blog/',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/blog/blog.json')}"
     >
   <head>
     <title id="title">Blog</title>
index cab064d..5e80bf2 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/contact.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/contact.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent})}"
     >
   <head>
     <title id="title">Contact</title>
index 6d9871c..483273b 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/datenschutz.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/datenschutz.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent})}"
     >
   <head>
     <title id="title">Datenschutz</title>
index 0b38910..9dc339d 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/expertise.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/expertise.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent})}"
     >
   <head>
     <title id="title">Expertise</title>
index b8005b7..3aca8a4 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/haftung-inhalte.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/haftung-inhalte.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent})}"
     >
   <head>
     <title id="title">Haftung für Inhalte</title>
index 06b2bb7..f7b60bd 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/haftung-links.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/haftung-links.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent})}"
     >
   <head>
     <title id="title">Haftung für Links</title>
index 3cf7755..6e8b1bc 100644 (file)
@@ -1,10 +1,15 @@
 <!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',
+      title=~{:: title},
+      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"/>
index d01d494..f0e210e 100644 (file)
@@ -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=~{:: title},
+      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"/>
index fc4afcd..ceb8820 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/accelerator.html', json='MERGE:potemkin.json,MERGE:
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/accelerator.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:potemkin.json,MERGE:
       {
         &quot;_titles&quot;: {
           &quot;/potemkin/accelerator.html&quot;: &quot;Accelerator&quot;,
index 097777b..e38c5bf 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/fix-swf/getting-started.html', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/fix-swf/getting-started.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">Fix SWF - Getting Started</title>
index a01c064..dc223b7 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/fix-swf/overview.html', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/fix-swf/overview.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">Fix SWF - Overview</title>
index 19ae960..57e0127 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente.html', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente</title>
index eb7993d..7a6f1e7 100644 (file)
@@ -5,7 +5,11 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" th:remove="all"/>
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/base.css" th:href="@{/css/base.min.css}"/>
   </head>
-  <body th:replace="~{/templates/layout.html :: body(uri='/potemkin/html-experimente/basis-layout.html', json='MERGE:/potemkin.json')}">
+  <body th:replace="~{/templates/layout.html :: body(
+      uri='/potemkin/html-experimente/basis-layout.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}">
     <main class="maincontent">
       <header><h1>Nur das Basis-Layout</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
index f45a48c..83b0022 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente/breadcrumb.html', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente/breadcrumb.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente - Langer Breadcrumb</title>
index 198aca2..d7d1d05 100644 (file)
@@ -6,7 +6,11 @@
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/base.css" th:href="@{/css/base.css}"/>
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/print.css" th:href="@{/css/print.css}"/>
   </head>
-  <body th:replace="~{/templates/layout.html :: body(uri='/potemkin/html-experimente/druck-layout.html', json='MERGE:/potemkin.json')}">
+  <body th:replace="~{/templates/layout.html :: body(
+      uri='/potemkin/html-experimente/druck-layout.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}">
     <main class="maincontent">
       <header><h1>Die für den Ausdruck angepasste Ansicht</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
index 1c003d2..f5a5ed4 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='unknown', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='unknown',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     xmlns:layout="http://www.thymeleaf.org"
     layout:decorator="templates/layout"
     >
index 8746520..2cee18d 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html', contentclass='onecolumn', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, contentclass='onecolumn', json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente - Fast leere einspaltige Seite mit Marginalinhalt</title>
index 45c228a..61ba66d 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente/fast-leer-einspaltig.html', contentclass='onecolumn', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente/fast-leer-einspaltig.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, contentclass='onecolumn', json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente - Fast leere einspaltige Seite</title>
index db54b50..4ba20f5 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente/fast-leer-kein-menü-aber-marginalinhalt.html', contentclass='nomenu', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente/fast-leer-kein-menü-aber-marginalinhalt.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, contentclass='nomenu', json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente - Fast leere Seite ohne Menü aber mit Marginalspalte</title>
index 76c6526..1280a18 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente/fast-leer-kein-menü.html', contentclass='nomenu', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente/fast-leer-kein-menü.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, contentclass='nomenu', json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente - Fast leere Seite ohne Menü</title>
index e5f3164..d279eeb 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente/fast-leer-mit-menü-und-marginalinhalt.html', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente/fast-leer-mit-menü-und-marginalinhalt.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente - Fast leere Seite mit Menü und Marginalinhalt</title>
index c63096f..930fe06 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente/fast-leer-mit-menü.html', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente/fast-leer-mit-menü.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente - Fast leere Seite mit Menü</title>
index 35b3265..a5bfed7 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente/formulare.html', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente/formulare.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente - Formulare</title>
index 86cd227..0807454 100644 (file)
@@ -4,7 +4,11 @@
     <title>HTML-Experimente - Kein Layout</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" th:remove="all"/>
   </head>
-  <body th:replace="~{/templates/layout.html :: body(uri='/potemkin/html-experimente/kein-layout.html', json='MERGE:/potemkin.json')}">
+  <body th:replace="~{/templates/layout.html :: body(
+      uri='/potemkin/html-experimente/kein-layout.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}">
     <main class="maincontent">
       <header><h1>Alle Stylings deaktiviert</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
index b819188..e341625 100644 (file)
@@ -6,7 +6,11 @@
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/base.css" th:href="@{/css/base.css}"/>
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/phone.css" th:href="@{/css/phone.css}"/>
   </head>
-  <body th:replace="~{/templates/layout.html :: body(uri='/potemkin/html-experimente/phone.html', json='MERGE:/potemkin.json')}">
+  <body th:replace="~{/templates/layout.html :: body(
+      uri='/potemkin/html-experimente/phone.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}">
     <main class="maincontent">
       <header><h1>Layout für Smartphones</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
index 7223556..6d3e3b5 100644 (file)
@@ -6,7 +6,11 @@
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/base.css" th:href="@{/css/base.css}"/>
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/seitenaufteilung.css" th:href="@{/css/seitenaufteilung.css}"/>
   </head>
-  <body th:replace="~{/templates/layout.html :: body(uri='/potemkin/html-experimente/seitenaufteilung.html', json='MERGE:/potemkin.json')}">
+  <body th:replace="~{/templates/layout.html :: body(
+      uri='/potemkin/html-experimente/seitenaufteilung.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}">
     <main class="maincontent">
       <header><h1>Nur das Basis-Layout und die Seitenaufteiltung</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
index f3319f0..1b287ef 100644 (file)
@@ -6,7 +6,11 @@
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/base.css" th:href="@{/css/base.css}"/>
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/seitenkopf.css" th:href="@{/css/seitenkopf.css}"/>
   </head>
-  <body th:replace="~{/templates/layout.html :: body(uri='/potemkin/html-experimente/seitenkopf.html', json='MERGE:/potemkin.json')}">
+  <body th:replace="~{/templates/layout.html :: body(
+      uri='/potemkin/html-experimente/seitenkopf.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}">
     <main class="maincontent">
       <header><h1>Nur das Basis-Layout und der Seitenkopf</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
index 6e7de59..edafa33 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/html-experimente/symbole.html', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/html-experimente/symbole.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">HTML-Experimente - Symbol-Font</title>
index d55024a..d8f15b9 100644 (file)
@@ -6,7 +6,11 @@
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/base.css" th:href="@{/css/base.css}"/>
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/tablet.css" th:href="@{/css/tablet.css}"/>
   </head>
-  <body th:replace="~{/templates/layout.html :: body(uri='/potemkin/html-experimente/tablet.html', json='MERGE:/potemkin.json')}">
+  <body th:replace="~{/templates/layout.html :: body(
+      uri='/potemkin/html-experimente/tablet.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}">
     <main class="maincontent">
       <header><h1>Layout für Tablets</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
index de36bc6..4d925cb 100644 (file)
@@ -6,7 +6,11 @@
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/base.css" th:href="@{/css/base.css}"/>
     <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../../css/tiny.css" th:href="@{/css/tiny.css}"/>
   </head>
-  <body th:replace="~{/templates/layout.html :: body(uri='/potemkin/html-experimente/tiny.html', json='MERGE:/potemkin.json')}">
+  <body th:replace="~{/templates/layout.html :: body(
+      uri='/potemkin/html-experimente/tiny.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}">
     <main class="maincontent">
       <header><h1>Layout für sehr kleine Bildschirmgrößen</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
index 5ac7eec..7dcf6e8 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/potemkin/typo.html', json='MERGE:potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/potemkin/typo.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:potemkin.json')}"
     >
   <head>
     <title id="title">Typography</title>
index e7774af..5a113d7 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/projects.html', json='MERGE:/potemkin.json')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/projects.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}"
     >
   <head>
     <title id="title">Projects - Potemkinsche Dörfer!</title>
index c3225cb..93256a9 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/references.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/references.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent})}"
     >
   <head>
     <title id="title">References</title>
index 8d0593f..5f977e9 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/templates/404.html', contentclass='nomenu')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/templates/404.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, contentclass='nomenu')}"
     >
   <head>
     <title id="title">404: Page Not Found!</title>
index a7d2db9..cdf9c3c 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/templates/error.html', contentclass='nomenu')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/templates/error.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent}, contentclass='nomenu')}"
     >
   <head>
     <title id="title">An Unexpected Error Occured!</title>
index 752d254..975df3c 100644 (file)
@@ -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:replace="${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 -->
@@ -37,7 +37,7 @@
     <link rel="caononical" href="layout.html" th:replace="~{:: #canonical}?:~{}"/>
   </head>
   <body
-      th:fragment="body(uri)"
+      th:fragment="body(uri, maincontent, marginalcontent)"
       thymeproxy:variables="${json}"
       th:with="crumbs=${_crumbs.get(uri)}"
       id="top"
@@ -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>
             </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>
index 4df29c7..812d4a0 100644 (file)
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html
     xmlns="http://www.w3.org/1999/xhtml"
-    th:replace="~{/templates/layout.html :: layout(uri='/urheberrechte.html')}"
+    th:replace="~{/templates/layout.html :: layout(
+      uri='/urheberrechte.html',
+      title=~{:: title},
+      maincontent=~{:: .maincontent},
+      marginalcontent=~{:: .marginalcontent})}"
     >
   <head>
     <title id="title">Urheberrecht</title>