From 91975c8a0b19f7b5799fa8917355fa35d5894295 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 1 Mar 2021 22:05:29 +0100 Subject: [PATCH 1/9] WIP:Weg... --- dist/sitemap.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/sitemap.json b/dist/sitemap.json index 2e468158..92d446df 100644 --- a/dist/sitemap.json +++ b/dist/sitemap.json @@ -25,9 +25,9 @@ "/blog/": [], "/projects.html": [ "/hibernate-maven-plugin/index.html", - "/projects/hibernate-maven-plugin-2.1.2-SNAPSHOT/index.html", + "/projects/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html", "/http-resources/2.0.0/index.html", - "/maven-thymeleaf-skin/1.1-SNAPSHOT/index.html" + "/maven-thymeleaf-skin/1.1.0/index.html" ], "/about.html": [ "/expertise.html", -- 2.20.1 From fe6609ac73c02e777783178b75d8c2f9adc93fc4 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Sun, 6 Mar 2022 23:20:17 +0100 Subject: [PATCH 2/9] WIP: Weg finden... --- dist/potemkin.html | 31 +++++++++++++++++++++++++++++++ dist/potemkin.json | 4 ---- dist/projects.html | 2 +- dist/projects.json | 31 +++++++++++++++++++++++++++++++ dist/sitemap.json | 10 ++++------ 5 files changed, 67 insertions(+), 11 deletions(-) create mode 100644 dist/potemkin.html create mode 100644 dist/projects.json diff --git a/dist/potemkin.html b/dist/potemkin.html new file mode 100644 index 00000000..5a113d72 --- /dev/null +++ b/dist/potemkin.html @@ -0,0 +1,31 @@ + + + + Projects - Potemkinsche Dörfer! + + + + + + + + + +
+

Projects - Potemkinsche Dörfer!

+ +
+ + diff --git a/dist/potemkin.json b/dist/potemkin.json index c3765e93..f89bba33 100644 --- a/dist/potemkin.json +++ b/dist/potemkin.json @@ -71,10 +71,6 @@ ] }, "_crumbs": { - "/projects.html": [ - "/index.html", - "/projects.html" - ], "/potemkin/fix-swf/overview.html": [ "/index.html", "/projects.html", diff --git a/dist/projects.html b/dist/projects.html index 5a113d72..d385c7c8 100644 --- a/dist/projects.html +++ b/dist/projects.html @@ -5,7 +5,7 @@ uri='/projects.html', title=~{:: title}, maincontent=~{:: .maincontent}, - marginalcontent=~{:: .marginalcontent}, json='MERGE:/potemkin.json')}" + marginalcontent=~{:: .marginalcontent}, json='MERGE:/projects.json')}" > Projects - Potemkinsche Dörfer! diff --git a/dist/projects.json b/dist/projects.json new file mode 100644 index 00000000..9f2de230 --- /dev/null +++ b/dist/projects.json @@ -0,0 +1,31 @@ +{ + "_titles": { + "/hibernate-maven-plugin/index.html": "Hibernate Maven Plugin", + "/http-resources/2.0.0/index.html": "HTTP resources", + "/maven-thymeleaf-skin/1.1.0/index.html": "Maven Thymeleaf Skin" + }, + "_childs": { + "/projects.html": [ + "/hibernate-maven-plugin/index.html", + "/http-resources/2.0.0/index.html", + "/maven-thymeleaf-skin/1.1.0/index.html" + ] + }, + "_crumbs": { + "/hibernate-maven-plugin/index.html": [ + "/index.html", + "/projects.html", + "/hibernate-maven-plugin/index.html" + ], + "/http-resources/2.0.0/index.html": [ + "/index.html", + "/projects.html", + "/http-resources/2.0.0/index.html" + ], + "/maven-thymeleaf-skin/1.1.0/index.html": [ + "/index.html", + "/projects.html", + "/maven-thymeleaf-skin/1.1.0/index.html" + ] + } +} diff --git a/dist/sitemap.json b/dist/sitemap.json index 92d446df..02e6f93e 100644 --- a/dist/sitemap.json +++ b/dist/sitemap.json @@ -23,12 +23,6 @@ "/about.html" ], "/blog/": [], - "/projects.html": [ - "/hibernate-maven-plugin/index.html", - "/projects/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html", - "/http-resources/2.0.0/index.html", - "/maven-thymeleaf-skin/1.1.0/index.html" - ], "/about.html": [ "/expertise.html", "/references.html", @@ -47,6 +41,10 @@ "/index.html": [ "/index.html" ], + "/projects.html": [ + "/index.html", + "/projects.html" + ], "/about.html": [ "/index.html", "/about.html" -- 2.20.1 From 82de3613242947148e6e95739c08e7519fb71d4e Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 7 Mar 2022 18:00:58 +0100 Subject: [PATCH 3/9] WIP: Weg finden... --- dist/projects.html | 2 +- dist/projects.json | 31 ------------------------------- dist/sitemap.json | 23 +++++++++++++++++++++++ 3 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 dist/projects.json diff --git a/dist/projects.html b/dist/projects.html index d385c7c8..d80d751e 100644 --- a/dist/projects.html +++ b/dist/projects.html @@ -5,7 +5,7 @@ uri='/projects.html', title=~{:: title}, maincontent=~{:: .maincontent}, - marginalcontent=~{:: .marginalcontent}, json='MERGE:/projects.json')}" + marginalcontent=~{:: .marginalcontent})}" > Projects - Potemkinsche Dörfer! diff --git a/dist/projects.json b/dist/projects.json deleted file mode 100644 index 9f2de230..00000000 --- a/dist/projects.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "_titles": { - "/hibernate-maven-plugin/index.html": "Hibernate Maven Plugin", - "/http-resources/2.0.0/index.html": "HTTP resources", - "/maven-thymeleaf-skin/1.1.0/index.html": "Maven Thymeleaf Skin" - }, - "_childs": { - "/projects.html": [ - "/hibernate-maven-plugin/index.html", - "/http-resources/2.0.0/index.html", - "/maven-thymeleaf-skin/1.1.0/index.html" - ] - }, - "_crumbs": { - "/hibernate-maven-plugin/index.html": [ - "/index.html", - "/projects.html", - "/hibernate-maven-plugin/index.html" - ], - "/http-resources/2.0.0/index.html": [ - "/index.html", - "/projects.html", - "/http-resources/2.0.0/index.html" - ], - "/maven-thymeleaf-skin/1.1.0/index.html": [ - "/index.html", - "/projects.html", - "/maven-thymeleaf-skin/1.1.0/index.html" - ] - } -} diff --git a/dist/sitemap.json b/dist/sitemap.json index 02e6f93e..029b1a1b 100644 --- a/dist/sitemap.json +++ b/dist/sitemap.json @@ -3,6 +3,9 @@ "/index.html": "Home", "/blog/": "Blog", "/projects.html": "Projects", + "/hibernate-maven-plugin/index.html": "Hibernate Maven Plugin", + "/http-resources/2.0.0/index.html": "HTTP resources", + "/maven-thymeleaf-skin/1.1.0/index.html": "Maven Thymeleaf Skin", "/about.html": "About", "/expertise.html": "Expertise", "/references.html": "References", @@ -23,6 +26,11 @@ "/about.html" ], "/blog/": [], + "/projects.html": [ + "/hibernate-maven-plugin/index.html", + "/http-resources/2.0.0/index.html", + "/maven-thymeleaf-skin/1.1.0/index.html" + ], "/about.html": [ "/expertise.html", "/references.html", @@ -45,6 +53,21 @@ "/index.html", "/projects.html" ], + "/hibernate-maven-plugin/index.html": [ + "/index.html", + "/projects.html", + "/hibernate-maven-plugin/index.html" + ], + "/http-resources/2.0.0/index.html": [ + "/index.html", + "/projects.html", + "/http-resources/2.0.0/index.html" + ], + "/maven-thymeleaf-skin/1.1.0/index.html": [ + "/index.html", + "/projects.html", + "/maven-thymeleaf-skin/1.1.0/index.html" + ], "/about.html": [ "/index.html", "/about.html" -- 2.20.1 From 12f390c276e9b7ea2d69657c77408cf1b88ad1df Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 7 Mar 2022 18:03:24 +0100 Subject: [PATCH 4/9] WIP: Weg finden... --- dist/sitemap.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/sitemap.json b/dist/sitemap.json index 029b1a1b..e664d572 100644 --- a/dist/sitemap.json +++ b/dist/sitemap.json @@ -3,7 +3,7 @@ "/index.html": "Home", "/blog/": "Blog", "/projects.html": "Projects", - "/hibernate-maven-plugin/index.html": "Hibernate Maven Plugin", + "/hibernate-maven-plugin-2.1.0/index.html": "Hibernate Maven Plugin", "/http-resources/2.0.0/index.html": "HTTP resources", "/maven-thymeleaf-skin/1.1.0/index.html": "Maven Thymeleaf Skin", "/about.html": "About", @@ -27,7 +27,7 @@ ], "/blog/": [], "/projects.html": [ - "/hibernate-maven-plugin/index.html", + "/hibernate-maven-plugin-2.1.0/index.html", "/http-resources/2.0.0/index.html", "/maven-thymeleaf-skin/1.1.0/index.html" ], @@ -53,10 +53,10 @@ "/index.html", "/projects.html" ], - "/hibernate-maven-plugin/index.html": [ + "/hibernate-maven-plugin-2.1.0/index.html": [ "/index.html", "/projects.html", - "/hibernate-maven-plugin/index.html" + "/hibernate-maven-plugin-2.1.0/index.html" ], "/http-resources/2.0.0/index.html": [ "/index.html", -- 2.20.1 From d85516340aa5db09b760e47b6654849e7d4e6c18 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 7 Mar 2022 20:43:43 +0100 Subject: [PATCH 5/9] WIP: Weg finden... --- dist/sitemap.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/sitemap.json b/dist/sitemap.json index e664d572..a85269fd 100644 --- a/dist/sitemap.json +++ b/dist/sitemap.json @@ -3,7 +3,7 @@ "/index.html": "Home", "/blog/": "Blog", "/projects.html": "Projects", - "/hibernate-maven-plugin-2.1.0/index.html": "Hibernate Maven Plugin", + "/hibernate-maven-plugin/index.html": "Hibernate Maven Plugin", "/http-resources/2.0.0/index.html": "HTTP resources", "/maven-thymeleaf-skin/1.1.0/index.html": "Maven Thymeleaf Skin", "/about.html": "About", @@ -27,7 +27,7 @@ ], "/blog/": [], "/projects.html": [ - "/hibernate-maven-plugin-2.1.0/index.html", + "/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html", "/http-resources/2.0.0/index.html", "/maven-thymeleaf-skin/1.1.0/index.html" ], @@ -53,10 +53,10 @@ "/index.html", "/projects.html" ], - "/hibernate-maven-plugin-2.1.0/index.html": [ + "/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html": [ "/index.html", "/projects.html", - "/hibernate-maven-plugin-2.1.0/index.html" + "/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html" ], "/http-resources/2.0.0/index.html": [ "/index.html", -- 2.20.1 From 637fc5a1b16d6357486e349dcc283b4ccb8d034d Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 7 Mar 2022 22:18:59 +0100 Subject: [PATCH 6/9] WIP: Weg finden... --- TODO.txt | 30 +++++++++++++++++++++++++++--- dist/sitemap.json | 24 ++++++++++++------------ 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/TODO.txt b/TODO.txt index 278b0f1f..fd1e5b5f 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,6 +1,30 @@ +DONE: + +* maven-thymeleaf-skin generiert _immer_ Pfade der Art PFAD/VERSION +* Die Projekte kommen unter /projects/NAME/VERSION zu liegen +* Die URI der Einstiegsseite muss in der sitemap.json eingetragen sein +** /projects/NAME/VERSION/index.html unter `_titles` +** /projects/NAME/VERSION/index.html als Kind von `/projects.html` +** Passende Breadcrumbs für die Seite nicht vergessen! +** *Achtung:* Menü wird bei Fehlern nicht korrekt (vollständig!) generiert +* PASST SO NICHT: Pfade für die Canonical-Links... + +TODO: + +* Canonical-Links fehlen im Layout noch! +* Diese auch in der JSON-Map ablegen? * Keine hartkodierten Links mit juplo.de im Content!! -* Links mit Version in thymeleaf-skin generieren -* ABER: Für oberste Ebene nicht?!? +* Fehler in maven-thymeleaf-skin werfen, wenn `command` nicht gesetzt ist +* Links mit Version in maven-thymeleaf-skin mit "-" anstatt "/" generieren +** Das /projects/ im Pfad wird _nur_ benötigt, weil sonst die Inhalte der + aktuellen Version im selben Verzeichnis liegen müssen, in dem die + Unterverzeichnisse der Versionen liegen. +** Das ist blöd, da es unübersichtlich ist und sich der Inhalt für die + Canonical-Links dann nicht per symbolischen Link auf das entsprechende + Verzeichnis der aktuellen Version realisieren lässt. +** Außerdem passen die von maven-thymeleaf-skin erzeugten Canonical-Links + dann nicht, da bei diesen nur die Version weggelassen wird - d.h., es + bleibt das führende "/projects/" erhalten, das über die site.xml von + außen vorgegeben wird. * 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! diff --git a/dist/sitemap.json b/dist/sitemap.json index a85269fd..a1a4a2c7 100644 --- a/dist/sitemap.json +++ b/dist/sitemap.json @@ -3,9 +3,9 @@ "/index.html": "Home", "/blog/": "Blog", "/projects.html": "Projects", - "/hibernate-maven-plugin/index.html": "Hibernate Maven Plugin", - "/http-resources/2.0.0/index.html": "HTTP resources", - "/maven-thymeleaf-skin/1.1.0/index.html": "Maven Thymeleaf Skin", + "/projects/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html": "Hibernate Maven Plugin", + "/projects/http-resources/2.0.0/index.html": "HTTP resources", + "/projects/maven-thymeleaf-skin/1.1.0/index.html": "Maven Thymeleaf Skin", "/about.html": "About", "/expertise.html": "Expertise", "/references.html": "References", @@ -27,9 +27,9 @@ ], "/blog/": [], "/projects.html": [ - "/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html", - "/http-resources/2.0.0/index.html", - "/maven-thymeleaf-skin/1.1.0/index.html" + "/projects/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html", + "/projects/http-resources/2.0.0/index.html", + "/projects/maven-thymeleaf-skin/1.1.0/index.html" ], "/about.html": [ "/expertise.html", @@ -53,20 +53,20 @@ "/index.html", "/projects.html" ], - "/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html": [ + "/projects/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html": [ "/index.html", "/projects.html", - "/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html" + "/projects/hibernate-maven-plugin/2.1.2-SNAPSHOT/index.html" ], - "/http-resources/2.0.0/index.html": [ + "/projects/http-resources/2.0.0/index.html": [ "/index.html", "/projects.html", - "/http-resources/2.0.0/index.html" + "/projects/http-resources/2.0.0/index.html" ], - "/maven-thymeleaf-skin/1.1.0/index.html": [ + "/projects/maven-thymeleaf-skin/1.1.0/index.html": [ "/index.html", "/projects.html", - "/maven-thymeleaf-skin/1.1.0/index.html" + "/projects/maven-thymeleaf-skin/1.1.0/index.html" ], "/about.html": [ "/index.html", -- 2.20.1 From 909150793599d0c812c61d9c5eccb2b1fa872d6d Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 7 Mar 2022 22:24:41 +0100 Subject: [PATCH 7/9] WIP: Weg finden... --- TODO.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/TODO.txt b/TODO.txt index fd1e5b5f..58d06bc4 100644 --- a/TODO.txt +++ b/TODO.txt @@ -26,5 +26,10 @@ TODO: dann nicht, da bei diesen nur die Version weggelassen wird - d.h., es bleibt das führende "/projects/" erhalten, das über die site.xml von außen vorgegeben wird. +** ALTERNATIVE: Es ist vielleicht doch schöner, wenn man den Prefix + "/projects" über einen Parameter konfigurierbar macht, so dass die + Canonical-Links wieder stimmen - Vorteil: Nur ein Pfad ("/projects/") + muss in der Webserver-Konfig in die Webserver-Root, in der branding-ng + liegt, hineingemappt werden und nicht immer jede Projekt-Version neu. * Nicht bis ins letzte Detail automatisieren: Letzte Anpassungen von Hand (Z.B., zusätzliche/geänderte Links nachdem neue Version herausgekommen ist?) -- 2.20.1 From 47334b320ba9c54579a12f2202498e5ffa6f58ed Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 7 Mar 2022 23:13:47 +0100 Subject: [PATCH 8/9] WIP: Weg finden... --- TODO.txt | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/TODO.txt b/TODO.txt index 58d06bc4..f81c8c7c 100644 --- a/TODO.txt +++ b/TODO.txt @@ -7,29 +7,11 @@ DONE: ** /projects/NAME/VERSION/index.html als Kind von `/projects.html` ** Passende Breadcrumbs für die Seite nicht vergessen! ** *Achtung:* Menü wird bei Fehlern nicht korrekt (vollständig!) generiert -* PASST SO NICHT: Pfade für die Canonical-Links... +* Das Mapping von /NAME/ auf /projects/NAME/VERSION/index.html in der + Konfiguration des Webservers muss angepasst werden - Vorteil: + Neue Doku kann deployed und getestet werden, bevor sie sichtbar + gemacht werden muss. TODO: -* Canonical-Links fehlen im Layout noch! -* Diese auch in der JSON-Map ablegen? * Keine hartkodierten Links mit juplo.de im Content!! -* Fehler in maven-thymeleaf-skin werfen, wenn `command` nicht gesetzt ist -* Links mit Version in maven-thymeleaf-skin mit "-" anstatt "/" generieren -** Das /projects/ im Pfad wird _nur_ benötigt, weil sonst die Inhalte der - aktuellen Version im selben Verzeichnis liegen müssen, in dem die - Unterverzeichnisse der Versionen liegen. -** Das ist blöd, da es unübersichtlich ist und sich der Inhalt für die - Canonical-Links dann nicht per symbolischen Link auf das entsprechende - Verzeichnis der aktuellen Version realisieren lässt. -** Außerdem passen die von maven-thymeleaf-skin erzeugten Canonical-Links - dann nicht, da bei diesen nur die Version weggelassen wird - d.h., es - bleibt das führende "/projects/" erhalten, das über die site.xml von - außen vorgegeben wird. -** ALTERNATIVE: Es ist vielleicht doch schöner, wenn man den Prefix - "/projects" über einen Parameter konfigurierbar macht, so dass die - Canonical-Links wieder stimmen - Vorteil: Nur ein Pfad ("/projects/") - muss in der Webserver-Konfig in die Webserver-Root, in der branding-ng - liegt, hineingemappt werden und nicht immer jede Projekt-Version neu. -* Nicht bis ins letzte Detail automatisieren: Letzte Anpassungen von Hand - (Z.B., zusätzliche/geänderte Links nachdem neue Version herausgekommen ist?) -- 2.20.1 From 9ef3a85339f8e87932c9b36d2ef324afd5854e93 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Mon, 7 Mar 2022 23:14:32 +0100 Subject: [PATCH 9/9] =?utf8?q?Kanonische=20Links=20=C3=BCber=20=5Fcanonica?= =?utf8?q?l=20realisiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- dist/sitemap.json | 3 ++- dist/templates/layout.html | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dist/sitemap.json b/dist/sitemap.json index a1a4a2c7..e97ceff8 100644 --- a/dist/sitemap.json +++ b/dist/sitemap.json @@ -130,5 +130,6 @@ "/index.html", "/templates/error.html" ] - } + }, + "_canonical": {} } diff --git a/dist/templates/layout.html b/dist/templates/layout.html index 16da131a..7175241e 100644 --- a/dist/templates/layout.html +++ b/dist/templates/layout.html @@ -5,17 +5,17 @@ th:fragment="layout(uri,maincontent)" thymeproxy:variables="SET:sitemap.json" > - + juplo - BASISTEMPLATE - + +
-- 2.20.1