From 4d41234c1464857d17651cb1c5f870b45cc4a779 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 6 May 2019 22:50:36 +0200 Subject: [PATCH 01/16] =?utf8?q?Canonical=20Link=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- dist/templates/layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/templates/layout.html b/dist/templates/layout.html index 70ef0309..66625fac 100644 --- a/dist/templates/layout.html +++ b/dist/templates/layout.html @@ -34,6 +34,7 @@ + Date: Mon, 6 May 2019 23:14:32 +0200 Subject: [PATCH 02/16] =?utf8?q?=C3=9Cbersichtsseiten=20(Seiten=20mit=20Un?= =?utf8?q?terseiten),=20werden=20nur=20einmal=20angezeigt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * Die "Overview"-Einträge in dem Untermenü werde jetzt einfach unterdrückt * Löst auch Problem mit der vereinfachten JSON-Struktur: es konnte dort kein alternativer Name (i.d.R. "Overview") für diesen doppelten Eintrag angegeben werden. * Außerdem: Falsche Benennung in den JSON-Daten korrigiert --- dist/potemkin.json | 2 +- dist/potemkin/accelerator.html | 2 +- dist/templates/layout.html | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/potemkin.json b/dist/potemkin.json index bb2b66c5..a53ef5ff 100644 --- a/dist/potemkin.json +++ b/dist/potemkin.json @@ -1,7 +1,7 @@ { "_titles": { "/projects.html": "Projects", - "/potemkin/fix-swf/overview.html": "Overview", + "/potemkin/fix-swf/overview.html": "Fix SWF", "#faq": "FAQ", "#documentation": "Documentation", "/potemkin/accelerator.html": "Accellerator", diff --git a/dist/potemkin/accelerator.html b/dist/potemkin/accelerator.html index 7c8b08d0..fc4afcd7 100644 --- a/dist/potemkin/accelerator.html +++ b/dist/potemkin/accelerator.html @@ -4,7 +4,7 @@ th:replace="~{/templates/layout.html :: layout(uri='/potemkin/accelerator.html', json='MERGE:potemkin.json,MERGE: { "_titles": { - "/potemkin/accelerator.html": "Overview", + "/potemkin/accelerator.html": "Accelerator", "/potemkin/accelerator.html#read-on": "Read on", "/potemkin/accelerator.html#read-on-and-on": "Read on and on", "/potemkin/accelerator.html#read-on-and-on-and-on": "Read on and on and on", diff --git a/dist/templates/layout.html b/dist/templates/layout.html index 66625fac..752d2548 100644 --- a/dist/templates/layout.html +++ b/dist/templates/layout.html @@ -157,6 +157,7 @@ th:class="'s' + (${childs} ? ' sub' : '') + (${selected or sibling or child} ? '' : ' off')" > Date: Wed, 8 May 2019 23:01:26 +0200 Subject: [PATCH 03/16] Die Attribute title/main/marginal werden explizit gesetzt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 %<---------------------------- --- dist/about.html | 9 +++++++-- dist/agb.html | 6 +++++- dist/blog/article.html | 6 +++++- dist/blog/comments.html | 6 +++++- dist/blog/index.html | 6 +++++- dist/contact.html | 6 +++++- dist/datenschutz.html | 6 +++++- dist/expertise.html | 6 +++++- dist/haftung-inhalte.html | 6 +++++- dist/haftung-links.html | 6 +++++- dist/impressum.html | 9 +++++++-- dist/index.html | 10 ++++++++-- dist/potemkin/accelerator.html | 6 +++++- dist/potemkin/fix-swf/getting-started.html | 6 +++++- dist/potemkin/fix-swf/overview.html | 6 +++++- dist/potemkin/html-experimente.html | 6 +++++- dist/potemkin/html-experimente/basis-layout.html | 6 +++++- dist/potemkin/html-experimente/breadcrumb.html | 6 +++++- dist/potemkin/html-experimente/druck-layout.html | 6 +++++- dist/potemkin/html-experimente/error.html | 6 +++++- .../fast-leer-einspaltig-mit-marginalinhalt.html | 6 +++++- .../html-experimente/fast-leer-einspaltig.html | 6 +++++- ...ast-leer-kein-men\303\274-aber-marginalinhalt.html" | 6 +++++- .../html-experimente/fast-leer-kein-men\303\274.html" | 6 +++++- .../fast-leer-mit-men\303\274-und-marginalinhalt.html" | 6 +++++- .../html-experimente/fast-leer-mit-men\303\274.html" | 6 +++++- dist/potemkin/html-experimente/formulare.html | 6 +++++- dist/potemkin/html-experimente/kein-layout.html | 6 +++++- dist/potemkin/html-experimente/phone.html | 6 +++++- dist/potemkin/html-experimente/seitenaufteilung.html | 6 +++++- dist/potemkin/html-experimente/seitenkopf.html | 6 +++++- dist/potemkin/html-experimente/symbole.html | 6 +++++- dist/potemkin/html-experimente/tablet.html | 6 +++++- dist/potemkin/html-experimente/tiny.html | 6 +++++- dist/potemkin/typo.html | 6 +++++- dist/projects.html | 6 +++++- dist/references.html | 6 +++++- dist/templates/404.html | 6 +++++- dist/templates/error.html | 6 +++++- dist/templates/layout.html | 10 +++++----- dist/urheberrechte.html | 6 +++++- 41 files changed, 212 insertions(+), 48 deletions(-) diff --git a/dist/about.html b/dist/about.html index cfc4ed19..442ce988 100644 --- a/dist/about.html +++ b/dist/about.html @@ -1,10 +1,15 @@ - About + About diff --git a/dist/agb.html b/dist/agb.html index 9fd47cc6..f7bf0095 100644 --- a/dist/agb.html +++ b/dist/agb.html @@ -1,7 +1,11 @@ Allgemeine Geschäftsbedingungen (AGB) diff --git a/dist/blog/article.html b/dist/blog/article.html index 8f9efec8..61427110 100644 --- a/dist/blog/article.html +++ b/dist/blog/article.html @@ -1,7 +1,11 @@ juplo - blog - Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources diff --git a/dist/blog/comments.html b/dist/blog/comments.html index b0c055f0..5f7316a8 100644 --- a/dist/blog/comments.html +++ b/dist/blog/comments.html @@ -1,7 +1,11 @@ juplo - blog - hibernate4-maven-plugin diff --git a/dist/blog/index.html b/dist/blog/index.html index 9ea279a8..287f577e 100644 --- a/dist/blog/index.html +++ b/dist/blog/index.html @@ -1,7 +1,11 @@ Blog diff --git a/dist/contact.html b/dist/contact.html index cab064d0..5e80bf20 100644 --- a/dist/contact.html +++ b/dist/contact.html @@ -1,7 +1,11 @@ Contact diff --git a/dist/datenschutz.html b/dist/datenschutz.html index 6d9871c0..483273b3 100644 --- a/dist/datenschutz.html +++ b/dist/datenschutz.html @@ -1,7 +1,11 @@ Datenschutz diff --git a/dist/expertise.html b/dist/expertise.html index 0b389102..9dc339d6 100644 --- a/dist/expertise.html +++ b/dist/expertise.html @@ -1,7 +1,11 @@ Expertise diff --git a/dist/haftung-inhalte.html b/dist/haftung-inhalte.html index b8005b7a..3aca8a40 100644 --- a/dist/haftung-inhalte.html +++ b/dist/haftung-inhalte.html @@ -1,7 +1,11 @@ Haftung für Inhalte diff --git a/dist/haftung-links.html b/dist/haftung-links.html index 06b2bb7a..f7b60bde 100644 --- a/dist/haftung-links.html +++ b/dist/haftung-links.html @@ -1,7 +1,11 @@ Haftung für Links diff --git a/dist/impressum.html b/dist/impressum.html index 3cf77556..6e8b1bcf 100644 --- a/dist/impressum.html +++ b/dist/impressum.html @@ -1,10 +1,15 @@ - Impressum + Impressum diff --git a/dist/index.html b/dist/index.html index d01d494b..f0e210ee 100644 --- a/dist/index.html +++ b/dist/index.html @@ -1,10 +1,16 @@ - Home + Home diff --git a/dist/potemkin/accelerator.html b/dist/potemkin/accelerator.html index fc4afcd7..ceb88208 100644 --- a/dist/potemkin/accelerator.html +++ b/dist/potemkin/accelerator.html @@ -1,7 +1,11 @@ Fix SWF - Getting Started diff --git a/dist/potemkin/fix-swf/overview.html b/dist/potemkin/fix-swf/overview.html index a01c0640..dc223b72 100644 --- a/dist/potemkin/fix-swf/overview.html +++ b/dist/potemkin/fix-swf/overview.html @@ -1,7 +1,11 @@ Fix SWF - Overview diff --git a/dist/potemkin/html-experimente.html b/dist/potemkin/html-experimente.html index 19ae9609..57e0127f 100644 --- a/dist/potemkin/html-experimente.html +++ b/dist/potemkin/html-experimente.html @@ -1,7 +1,11 @@ HTML-Experimente diff --git a/dist/potemkin/html-experimente/basis-layout.html b/dist/potemkin/html-experimente/basis-layout.html index eb7993d5..7a6f1e77 100644 --- a/dist/potemkin/html-experimente/basis-layout.html +++ b/dist/potemkin/html-experimente/basis-layout.html @@ -5,7 +5,11 @@ - +

Nur das Basis-Layout

MAIN-CONTENT diff --git a/dist/potemkin/html-experimente/breadcrumb.html b/dist/potemkin/html-experimente/breadcrumb.html index f45a48c3..83b00227 100644 --- a/dist/potemkin/html-experimente/breadcrumb.html +++ b/dist/potemkin/html-experimente/breadcrumb.html @@ -1,7 +1,11 @@ HTML-Experimente - Langer Breadcrumb diff --git a/dist/potemkin/html-experimente/druck-layout.html b/dist/potemkin/html-experimente/druck-layout.html index 198aca2f..d7d1d050 100644 --- a/dist/potemkin/html-experimente/druck-layout.html +++ b/dist/potemkin/html-experimente/druck-layout.html @@ -6,7 +6,11 @@ - +

Die für den Ausdruck angepasste Ansicht

MAIN-CONTENT diff --git a/dist/potemkin/html-experimente/error.html b/dist/potemkin/html-experimente/error.html index 1c003d23..f5a5ed47 100644 --- a/dist/potemkin/html-experimente/error.html +++ b/dist/potemkin/html-experimente/error.html @@ -1,7 +1,11 @@ diff --git a/dist/potemkin/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html b/dist/potemkin/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html index 87465205..2cee18da 100644 --- a/dist/potemkin/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html +++ b/dist/potemkin/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html @@ -1,7 +1,11 @@ HTML-Experimente - Fast leere einspaltige Seite mit Marginalinhalt diff --git a/dist/potemkin/html-experimente/fast-leer-einspaltig.html b/dist/potemkin/html-experimente/fast-leer-einspaltig.html index 45c228a2..61ba66da 100644 --- a/dist/potemkin/html-experimente/fast-leer-einspaltig.html +++ b/dist/potemkin/html-experimente/fast-leer-einspaltig.html @@ -1,7 +1,11 @@ HTML-Experimente - Fast leere einspaltige Seite diff --git "a/dist/potemkin/html-experimente/fast-leer-kein-men\303\274-aber-marginalinhalt.html" "b/dist/potemkin/html-experimente/fast-leer-kein-men\303\274-aber-marginalinhalt.html" index db54b50d..4ba20f57 100644 --- "a/dist/potemkin/html-experimente/fast-leer-kein-men\303\274-aber-marginalinhalt.html" +++ "b/dist/potemkin/html-experimente/fast-leer-kein-men\303\274-aber-marginalinhalt.html" @@ -1,7 +1,11 @@ HTML-Experimente - Fast leere Seite ohne Menü aber mit Marginalspalte diff --git "a/dist/potemkin/html-experimente/fast-leer-kein-men\303\274.html" "b/dist/potemkin/html-experimente/fast-leer-kein-men\303\274.html" index 76c65268..1280a183 100644 --- "a/dist/potemkin/html-experimente/fast-leer-kein-men\303\274.html" +++ "b/dist/potemkin/html-experimente/fast-leer-kein-men\303\274.html" @@ -1,7 +1,11 @@ HTML-Experimente - Fast leere Seite ohne Menü diff --git "a/dist/potemkin/html-experimente/fast-leer-mit-men\303\274-und-marginalinhalt.html" "b/dist/potemkin/html-experimente/fast-leer-mit-men\303\274-und-marginalinhalt.html" index e5f3164b..d279eeb5 100644 --- "a/dist/potemkin/html-experimente/fast-leer-mit-men\303\274-und-marginalinhalt.html" +++ "b/dist/potemkin/html-experimente/fast-leer-mit-men\303\274-und-marginalinhalt.html" @@ -1,7 +1,11 @@ HTML-Experimente - Fast leere Seite mit Menü und Marginalinhalt diff --git "a/dist/potemkin/html-experimente/fast-leer-mit-men\303\274.html" "b/dist/potemkin/html-experimente/fast-leer-mit-men\303\274.html" index c63096fa..930fe060 100644 --- "a/dist/potemkin/html-experimente/fast-leer-mit-men\303\274.html" +++ "b/dist/potemkin/html-experimente/fast-leer-mit-men\303\274.html" @@ -1,7 +1,11 @@ HTML-Experimente - Fast leere Seite mit Menü diff --git a/dist/potemkin/html-experimente/formulare.html b/dist/potemkin/html-experimente/formulare.html index 35b32653..a5bfed75 100644 --- a/dist/potemkin/html-experimente/formulare.html +++ b/dist/potemkin/html-experimente/formulare.html @@ -1,7 +1,11 @@ HTML-Experimente - Formulare diff --git a/dist/potemkin/html-experimente/kein-layout.html b/dist/potemkin/html-experimente/kein-layout.html index 86cd2276..0807454f 100644 --- a/dist/potemkin/html-experimente/kein-layout.html +++ b/dist/potemkin/html-experimente/kein-layout.html @@ -4,7 +4,11 @@ HTML-Experimente - Kein Layout - +

Alle Stylings deaktiviert

MAIN-CONTENT diff --git a/dist/potemkin/html-experimente/phone.html b/dist/potemkin/html-experimente/phone.html index b819188c..e341625b 100644 --- a/dist/potemkin/html-experimente/phone.html +++ b/dist/potemkin/html-experimente/phone.html @@ -6,7 +6,11 @@ - +

Layout für Smartphones

MAIN-CONTENT diff --git a/dist/potemkin/html-experimente/seitenaufteilung.html b/dist/potemkin/html-experimente/seitenaufteilung.html index 7223556c..6d3e3b58 100644 --- a/dist/potemkin/html-experimente/seitenaufteilung.html +++ b/dist/potemkin/html-experimente/seitenaufteilung.html @@ -6,7 +6,11 @@ - +

Nur das Basis-Layout und die Seitenaufteiltung

MAIN-CONTENT diff --git a/dist/potemkin/html-experimente/seitenkopf.html b/dist/potemkin/html-experimente/seitenkopf.html index f3319f0e..1b287ef8 100644 --- a/dist/potemkin/html-experimente/seitenkopf.html +++ b/dist/potemkin/html-experimente/seitenkopf.html @@ -6,7 +6,11 @@ - +

Nur das Basis-Layout und der Seitenkopf

MAIN-CONTENT diff --git a/dist/potemkin/html-experimente/symbole.html b/dist/potemkin/html-experimente/symbole.html index 6e7de597..edafa33b 100644 --- a/dist/potemkin/html-experimente/symbole.html +++ b/dist/potemkin/html-experimente/symbole.html @@ -1,7 +1,11 @@ HTML-Experimente - Symbol-Font diff --git a/dist/potemkin/html-experimente/tablet.html b/dist/potemkin/html-experimente/tablet.html index d55024a4..d8f15b95 100644 --- a/dist/potemkin/html-experimente/tablet.html +++ b/dist/potemkin/html-experimente/tablet.html @@ -6,7 +6,11 @@ - +

Layout für Tablets

MAIN-CONTENT diff --git a/dist/potemkin/html-experimente/tiny.html b/dist/potemkin/html-experimente/tiny.html index de36bc64..4d925cb0 100644 --- a/dist/potemkin/html-experimente/tiny.html +++ b/dist/potemkin/html-experimente/tiny.html @@ -6,7 +6,11 @@ - +

Layout für sehr kleine Bildschirmgrößen

MAIN-CONTENT diff --git a/dist/potemkin/typo.html b/dist/potemkin/typo.html index 5ac7eec2..7dcf6e81 100644 --- a/dist/potemkin/typo.html +++ b/dist/potemkin/typo.html @@ -1,7 +1,11 @@ Typography diff --git a/dist/projects.html b/dist/projects.html index e7774aff..5a113d72 100644 --- a/dist/projects.html +++ b/dist/projects.html @@ -1,7 +1,11 @@ Projects - Potemkinsche Dörfer! diff --git a/dist/references.html b/dist/references.html index c3225cbc..93256a92 100644 --- a/dist/references.html +++ b/dist/references.html @@ -1,7 +1,11 @@ References diff --git a/dist/templates/404.html b/dist/templates/404.html index 8d0593f0..5f977e93 100644 --- a/dist/templates/404.html +++ b/dist/templates/404.html @@ -1,7 +1,11 @@ 404: Page Not Found! diff --git a/dist/templates/error.html b/dist/templates/error.html index a7d2db94..cdf9c3c6 100644 --- a/dist/templates/error.html +++ b/dist/templates/error.html @@ -1,7 +1,11 @@ An Unexpected Error Occured! diff --git a/dist/templates/layout.html b/dist/templates/layout.html index 752d2548..975df3c8 100644 --- a/dist/templates/layout.html +++ b/dist/templates/layout.html @@ -2,11 +2,11 @@ - juplo - BASISTEMPLATE + juplo - BASISTEMPLATE @@ -37,7 +37,7 @@
-
+

juplo - BASISTEMPLATE

@@ -189,7 +189,7 @@

-
-
+

Pages

-- 2.20.1 From 5f252c02e210ff497031bbe204d010136dd8bb46 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Sun, 5 May 2019 14:03:17 +0200 Subject: [PATCH 16/16] WIP-thymeleaf-skin: TODO --- TODO.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 TODO.txt diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 00000000..278b0f1f --- /dev/null +++ b/TODO.txt @@ -0,0 +1,6 @@ +* Keine hartkodierten Links mit juplo.de im Content!! +* Links mit Version in thymeleaf-skin generieren +* ABER: Für oberste Ebene nicht?!? +* Nicht bis ins letzte Detail automatisieren: Letzte Anpassungen von Hand + (Z.B., zusätzliche/geänderte Links nachdem neue Version herausgekommen ist?) +* JSON für Menü-Generierung funktioniert nicht! -- 2.20.1