From 0cc387e26a38fe9d4c5bb1d3a69ea6a611f23e2a Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Fri, 3 May 2019 16:00:05 +0200 Subject: [PATCH 01/16] Verlinkung in Frontend-Projekt verbessert --- dist/index.html | 18 ++++++++++++++++++ dist/potemkin/html-experimente.html | 12 ++++++++++++ dist/projects.html | 6 ++++++ 3 files changed, 36 insertions(+) diff --git a/dist/index.html b/dist/index.html index 9230f246..c5f18584 100644 --- a/dist/index.html +++ b/dist/index.html @@ -28,6 +28,24 @@
  • About
  • +
    +

    Startseite

    +

    Die Templates

    + +

    Fake-Inhalte

    + +
    diff --git a/dist/potemkin/html-experimente.html b/dist/potemkin/html-experimente.html index b4b5c16e..f117b3bb 100644 --- a/dist/potemkin/html-experimente.html +++ b/dist/potemkin/html-experimente.html @@ -13,8 +13,20 @@ +
    +

    HTML-Elemente / spezielle Seiten

    +

    Die Templates

    + +

    HTML-Elemente / spezielle Seiten

    +

    Seiten zum Testen gerenderter Inhalte

    • Formulare
    • Symbol-Font
    • diff --git a/dist/projects.html b/dist/projects.html index 333bcde0..b7ab14ae 100644 --- a/dist/projects.html +++ b/dist/projects.html @@ -16,6 +16,12 @@

      Projects - Potemkinsche Dörfer!

      +
      -- 2.20.1 From d7a5c5bc6b899a6bbc265b936876eebe1eff80d9 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Sun, 7 Apr 2019 12:26:04 +0200 Subject: [PATCH 02/16] =?utf8?q?Dummy-Seiten=20f=C3=BCr=20Blog-Layout=20an?= =?utf8?q?=20Wordpress-Einbindung=20angepasst?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit blog.json und blog.html nach blog/blog.json und blog/index.html verschoben damit die Dummy-Inhalte bei aktiver Einbidung des Wordpress-Blogs vollständig überdeckt werden. --- dist/about.html | 2 +- dist/blog/article.html | 4 ++-- dist/{ => blog}/blog.json | 8 ++++---- dist/blog/comments.html | 4 ++-- dist/{blog.html => blog/index.html} | 4 ++-- dist/index.html | 6 +++--- .../fast-leer-einspaltig-mit-marginalinhalt.html | 4 ++-- dist/potemkin/html-experimente/fast-leer-einspaltig.html | 4 ++-- .../fast-leer-kein-men\303\274-aber-marginalinhalt.html" | 4 ++-- .../html-experimente/fast-leer-kein-men\303\274.html" | 4 ++-- dist/sitemap.json | 7 ++++--- dist/templates/404.html | 2 +- dist/templates/error.html | 2 +- dist/templates/layout.html | 2 +- 14 files changed, 29 insertions(+), 28 deletions(-) rename dist/{ => blog}/blog.json (74%) rename dist/{blog.html => blog/index.html} (99%) diff --git a/dist/about.html b/dist/about.html index 2a221855..e23ca8e7 100644 --- a/dist/about.html +++ b/dist/about.html @@ -37,7 +37,7 @@

      • - In the blog, I summarize, how I solved + In the blog, I summarize, how I solved some every-day problems, other people might stumble across too. I am introducing new projects there and announcing new versions and/or bugfixes to older projects. diff --git a/dist/blog/article.html b/dist/blog/article.html index 89653798..ec70b4ee 100644 --- a/dist/blog/article.html +++ b/dist/blog/article.html @@ -12,8 +12,8 @@ - -
        + +

        Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources

        diff --git a/dist/blog.json b/dist/blog/blog.json similarity index 74% rename from dist/blog.json rename to dist/blog/blog.json index b197f0ed..af1010cf 100644 --- a/dist/blog.json +++ b/dist/blog/blog.json @@ -1,26 +1,26 @@ { "pages": { - "/blog.html": { + "/blog/": { "name": "Blog", "childs": { "/blog/article.html": "An Article", "/blog/comments.html": "Comments" }, "crumbs": [ - { "uri": "/blog.html", "name": "Blog" } + { "uri": "/blog/", "name": "Blog" } ] }, "/blog/article.html": { "name": "An Article", "crumbs": [ - { "uri": "/blog.html", "name": "Blog" }, + { "uri": "/blog/", "name": "Blog" }, { "uri": "/blog/article.html", "name": "An Article" } ] }, "/blog/comments.html": { "name": "Comments", "crumbs": [ - { "uri": "/blog.html", "name": "Blog" }, + { "uri": "/blog/", "name": "Blog" }, { "uri": "/blog/comments.html", "name": "Comments" } ] } diff --git a/dist/blog/comments.html b/dist/blog/comments.html index b651d714..ca99b4d1 100644 --- a/dist/blog/comments.html +++ b/dist/blog/comments.html @@ -12,8 +12,8 @@ - -
        + +

        hibernate4-maven-plugin

        diff --git a/dist/blog.html b/dist/blog/index.html similarity index 99% rename from dist/blog.html rename to dist/blog/index.html index d15ec745..06791894 100644 --- a/dist/blog.html +++ b/dist/blog/index.html @@ -12,8 +12,8 @@ - -
        + +

        Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources

        diff --git a/dist/index.html b/dist/index.html index c5f18584..a5c90385 100644 --- a/dist/index.html +++ b/dist/index.html @@ -23,8 +23,8 @@

        Navigation

        @@ -58,7 +58,7 @@

        About juplo

        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 36319a45..29918050 100644 --- a/dist/potemkin/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html +++ b/dist/potemkin/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html @@ -19,8 +19,8 @@

        Navigation

        diff --git a/dist/potemkin/html-experimente/fast-leer-einspaltig.html b/dist/potemkin/html-experimente/fast-leer-einspaltig.html index 490e3ff7..4ddebc37 100644 --- a/dist/potemkin/html-experimente/fast-leer-einspaltig.html +++ b/dist/potemkin/html-experimente/fast-leer-einspaltig.html @@ -19,8 +19,8 @@

        Navigation

        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 a0c195a4..e7199e77 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" @@ -19,8 +19,8 @@

        Navigation

        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 12638d39..82922a0a 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" @@ -19,8 +19,8 @@

        Navigation

        diff --git a/dist/sitemap.json b/dist/sitemap.json index b4542cad..424fe813 100644 --- a/dist/sitemap.json +++ b/dist/sitemap.json @@ -1,14 +1,15 @@ { "sections": { - "blog": "/blog.html", + "blog": "/blog/", "projects": "/projects.html", "about": "/about.html" }, "pages": { "/index.html": { "name": "Home" }, - "/blog.html": { + "/blog/": { "name": "Blog", - "childs": {} + "childs": { "/blog/": "Blog" }, + "crumbs": [{ "uri": "/blog/", "name": "Blog" }] }, "/projects.html": { "name": "Projects", diff --git a/dist/templates/404.html b/dist/templates/404.html index 61269c27..f060476f 100644 --- a/dist/templates/404.html +++ b/dist/templates/404.html @@ -23,7 +23,7 @@

        Navigation

        diff --git a/dist/templates/error.html b/dist/templates/error.html index e749e6f4..668c8e94 100644 --- a/dist/templates/error.html +++ b/dist/templates/error.html @@ -23,7 +23,7 @@

        Navigation

        diff --git a/dist/templates/layout.html b/dist/templates/layout.html index 007770af..c542e55e 100644 --- a/dist/templates/layout.html +++ b/dist/templates/layout.html @@ -123,7 +123,7 @@
        -
        -
        -
        -
        -
    -