projects / website / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 15d3bfb)
WIP: title/main/marginal explizit
authorKai Moritz <kai@juplo.de>
Wed, 8 May 2019 21:21:31 +0000 (23:21 +0200)
committerKai Moritz <kai@juplo.de>
Thu, 9 May 2019 15:41:11 +0000 (17:41 +0200)
for i in `find -name '*.html'`; do sed -i -e's+body\(.\)\(uri='\''[^'\'']*'\''\)+body\1\n      \2,\n      title=~{:: title},\n      maincontent=~{:: .maincontent},\n      marginalcontent=~{:: .marginalcontent}+' $i; done

dist/potemkin/html-experimente/basis-layout.html patch | blob | history
dist/potemkin/html-experimente/druck-layout.html patch | blob | history
dist/potemkin/html-experimente/kein-layout.html patch | blob | history
dist/potemkin/html-experimente/phone.html patch | blob | history
dist/potemkin/html-experimente/seitenaufteilung.html patch | blob | history
dist/potemkin/html-experimente/seitenkopf.html patch | blob | history
dist/potemkin/html-experimente/tablet.html patch | blob | history
dist/potemkin/html-experimente/tiny.html patch | blob | history
dist/templates/layout.html patch | blob | history

diff --git a/dist/potemkin/html-experimente/basis-layout.html b/dist/potemkin/html-experimente/basis-layout.html
index eb7993d..7a6f1e7 100644 (file)
--- a/dist/potemkin/html-experimente/basis-layout.html
+++ b/dist/potemkin/html-experimente/basis-layout.html
@@ -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>
     <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>
     <main class="maincontent">
       <header><h1>Nur das Basis-Layout</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
diff --git a/dist/potemkin/html-experimente/druck-layout.html b/dist/potemkin/html-experimente/druck-layout.html
index 198aca2..d7d1d05 100644 (file)
--- a/dist/potemkin/html-experimente/druck-layout.html
+++ b/dist/potemkin/html-experimente/druck-layout.html
@@ -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>
     <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>
     <main class="maincontent">
       <header><h1>Die für den Ausdruck angepasste Ansicht</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
diff --git a/dist/potemkin/html-experimente/kein-layout.html b/dist/potemkin/html-experimente/kein-layout.html
index 86cd227..0807454 100644 (file)
--- a/dist/potemkin/html-experimente/kein-layout.html
+++ b/dist/potemkin/html-experimente/kein-layout.html
@@ -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>
     <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>
     <main class="maincontent">
       <header><h1>Alle Stylings deaktiviert</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
diff --git a/dist/potemkin/html-experimente/phone.html b/dist/potemkin/html-experimente/phone.html
index b819188..e341625 100644 (file)
--- a/dist/potemkin/html-experimente/phone.html
+++ b/dist/potemkin/html-experimente/phone.html
@@ -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>
     <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>
     <main class="maincontent">
       <header><h1>Layout für Smartphones</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
diff --git a/dist/potemkin/html-experimente/seitenaufteilung.html b/dist/potemkin/html-experimente/seitenaufteilung.html
index 7223556..6d3e3b5 100644 (file)
--- a/dist/potemkin/html-experimente/seitenaufteilung.html
+++ b/dist/potemkin/html-experimente/seitenaufteilung.html
@@ -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>
     <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>
     <main class="maincontent">
       <header><h1>Nur das Basis-Layout und die Seitenaufteiltung</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
diff --git a/dist/potemkin/html-experimente/seitenkopf.html b/dist/potemkin/html-experimente/seitenkopf.html
index f3319f0..1b287ef 100644 (file)
--- a/dist/potemkin/html-experimente/seitenkopf.html
+++ b/dist/potemkin/html-experimente/seitenkopf.html
@@ -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>
     <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>
     <main class="maincontent">
       <header><h1>Nur das Basis-Layout und der Seitenkopf</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
diff --git a/dist/potemkin/html-experimente/tablet.html b/dist/potemkin/html-experimente/tablet.html
index d55024a..d8f15b9 100644 (file)
--- a/dist/potemkin/html-experimente/tablet.html
+++ b/dist/potemkin/html-experimente/tablet.html
@@ -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>
     <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>
     <main class="maincontent">
       <header><h1>Layout für Tablets</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
diff --git a/dist/potemkin/html-experimente/tiny.html b/dist/potemkin/html-experimente/tiny.html
index de36bc6..4d925cb 100644 (file)
--- a/dist/potemkin/html-experimente/tiny.html
+++ b/dist/potemkin/html-experimente/tiny.html
@@ -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>
     <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>
     <main class="maincontent">
       <header><h1>Layout für sehr kleine Bildschirmgrößen</h1></header>
       <strong th:replace="/templates/layout.html :: maincontent">MAIN-CONTENT</strong>
diff --git a/dist/templates/layout.html b/dist/templates/layout.html
index 1f946dc..975df3c 100644 (file)
--- a/dist/templates/layout.html
+++ b/dist/templates/layout.html
@@ -37,7 +37,7 @@
     <link rel="caononical" href="layout.html" th:replace="~{:: #canonical}?:~{}"/>
   </head>
   <body
     <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"
       thymeproxy:variables="${json}"
       th:with="crumbs=${_crumbs.get(uri)}"
       id="top"
Unnamed repository; edit this file 'description' to name the repository.