]> juplo.de Git - website/commitdiff
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 cfc4ed192e304996e3b32bf2f9a1902a5893610d..442ce988f24e434b4f8548ac1c8a4e9e23de83b1 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 9fd47cc6d06dd1022d4c3e36144e6aacbeb4ef15..f7bf009529c79ef864486fa2802ce08458dfbbb8 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 8f9efec83d30f805d901cb820de2681cea09040b..614271104089a41cb1413cd6e233cce3210a4404 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 b0c055f0d07da742c8c1525e19a4df4b4866e541..5f7316a88526e020170f1d0190fd53df0b1a0ca0 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 9ea279a8d8f779e432494ec5f604b8dc2dc6026d..287f577e6089bf3a105560d7f8f35b5e770c96ab 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 cab064d03a3ebc00eaf2d441c21f615468b8b471..5e80bf2025eabf5b93dd6a32fee69e856377648f 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 6d9871c08826a22799777d5665100d9ddf5fb45d..483273b32f2f6ca2b165167f848ebef71f9b83d9 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 0b389102a7cadb681277b54a1a05d1ff0fc1c650..9dc339d695c49e76404aaeef5d6e3c16036b238e 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 b8005b7a2fec5883bdf41e2a5951c2cbd226df69..3aca8a40f68b208e523f60e9c9162e6899408aff 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 06b2bb7acf62d18fe0c71dadf07e68a6c2b1ee7e..f7b60bde4c9ac6a5be1c1bd16e8c6b3e31bade03 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 3cf775563f3d66a9a1b1ea26085f4fa53e6ad054..6e8b1bcf54d7048a320faed8ec1715c3fd5a9c98 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 d01d494b4cf9337d5bdfd6e09b785f96a016b956..f0e210ee405252b1b6493aaa0ad75efd256836e7 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 fc4afcd75c751296bc8d666a4c8293c39a761023..ceb88208d9ffb0a729f1532e7cf716dab4e7f030 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 097777b0fa1e4ebf99857deb65286e1ca02e1184..e38c5bfcfb4a0635338f8baac1f688d5f81a0e7d 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 a01c0640fc0f4b177706377b15b116db3dbe9c4c..dc223b729837479d406bf4e7d06e3426db48d560 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 19ae9609a2d29ae598a5b5f3505a4ba3448d146c..57e0127f1bada90a7ff9c90f555b9f6b299ad6a6 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 eb7993d5a08856ed1876c964115c62a20efd09d3..7a6f1e779f9f497f8d191fd7ac6d626d841d2238 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 f45a48c359f96880f0fe3cd1c67f3736b3da9ca4..83b002270ea5bba91a49a49ddfb9791615ef6a97 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 198aca2f6348e77c12811644c457175b34710df6..d7d1d050df2caecaf541435ba019219142bc212f 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 1c003d238f3dd0ceb59b967478a5c8b6c7293971..f5a5ed470e8bf73c6503352a999aa255f474cb7b 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 874652052b984c54545e08390fc9f1c5d114e063..2cee18da32f2390ccefc80a3c2e5900b3d0eb6a5 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 45c228a2cd49efd15d3901bd4f54c129816eb902..61ba66da79503a07d9bb750ab285c90559ba3ff4 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 db54b50da8ca5eab49f6ce0df31d8ae5b5692434..4ba20f57e08ed3473950df27d51e0435cd6ea6d2 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 76c65268b8f71c68993e423c90b1da51142c0ff4..1280a183968f6334318dcba386a0944d093d67b2 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 e5f3164b25c73c4d61e60cc0b9cc6e67db7ac4d9..d279eeb50ed25bb6b4f11ffab8e5a26cc084028d 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 c63096fa4ea170a32a9c2e46efb1f3df390a7883..930fe0606b12ea5171fe1366d1ca5e1064f1b975 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 35b326531974c73973b9d77ebaee7d6031b3193b..a5bfed7503f4f93dc910ab1e44dd33d72b3d9b55 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 86cd2276a4ca4bcedbaa509be7be267f692123d9..0807454f370dfd22221b5c66c0c290240b4d6f7d 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 b819188c6200e492c68c852797558d9f77780ceb..e341625bd6091116bdfa2ff929262718b85f2367 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 7223556cce135fd252a57eef33f643b89f044dd1..6d3e3b5887b2e37d6a6440955f5fc7ebd962b1c4 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 f3319f0eb6f1f7bb7250ef990ae80f202fc62c77..1b287ef8081e3f8fbedae812548c76d3ae2820da 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 6e7de5973a20148d4e5c013f52936a496b5a766f..edafa33be10f5b78cef145f20dfea0b259fbe9cb 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 d55024a40732425b03d4be4961cc212fe8ad4484..d8f15b95e082563d6a1064af991e73747912e361 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 de36bc64dc18e05cc0ab52bc4a01ff2b411126d6..4d925cb024eaa1e1abeafe83dd100641fffb3afc 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 5ac7eec2eb5d7c7948a052a456a4e13b798961ea..7dcf6e812a6ea5c2124a840d01c9921705227f36 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 e7774aff994f7965581fe7fea10b179de8053bb5..5a113d7232e7a51fe4a157b201199e64ad8f2c85 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 c3225cbc60f06d9658d296971c2f1001814b3d98..93256a92ed8e98063edcbb27f7d13a646f1d5176 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 8d0593f0e7dee66f9fe72cb756e8dc9b666192b1..5f977e93292135ca134bdada7bbfe62416a6f857 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 a7d2db945176920b06b86882d16cafc39445a32d..cdf9c3c66ffc8a9977a42b2e1220a02a661ad84f 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 752d2548af4714a7d0e9f6123a0c0a5ba776a701..975df3c811e95d71545beee03665162739e1bab5 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 4df29c7ee95c2e5c72f67876fc81afdfab5074e3..812d4a0bb4586d8083e32540730d54d1aa73e853 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>