From: Kai Moritz <kai@juplo.de>
Date: Tue, 5 Jul 2016 09:18:20 +0000 (+0200)
Subject: Einführung unterschiedlicher Untermenüs vorbereitet
X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=e5c68697877f14bc0db63c109c2502a879445517;p=website

Einführung unterschiedlicher Untermenüs vorbereitet
---

diff --git a/dist/thymeleaf/templates/layout.html b/dist/thymeleaf/templates/layout.html
index 23511638..af028fc2 100644
--- a/dist/thymeleaf/templates/layout.html
+++ b/dist/thymeleaf/templates/layout.html
@@ -124,7 +124,10 @@
               <a class="s selected" href="../projects.html" th:href="@{${section.uri}}" th:text="${section.name}">Projects</a>
             </h2>
             <ul layout:fragment="submenu"
-                th:with="parent=${(crumbs.size() == 2 and submenu.get(uri)['childs'] == null) ? crumbs[0].uri : null}, pos=1"
+                th:with="
+                  submenu=${menu[section.uri]},
+                  parent=${(crumbs.size() == 2 and submenu.get(uri)['childs'] == null) ? crumbs[0].uri : null},
+                  pos=1"
                 id="submenu"
                 class="s"
                 >
diff --git a/dist/thymeleaf/templates/variables.json b/dist/thymeleaf/templates/variables.json
index 612be66f..23d7a3d5 100644
--- a/dist/thymeleaf/templates/variables.json
+++ b/dist/thymeleaf/templates/variables.json
@@ -141,46 +141,48 @@
     "/projects.html": { "name": "Projects", "key": "projects" },
     "/about.html": { "name": "About", "key": "about" }
   },
-  "submenu": {
-    "#": { "name": "hibernate4-maven-plugin" },
-    "/projects/fix-swf.html": {
-      "name": "Fix SWF",
-      "childs": {
-        "/projects/fix-swf/overview.html": { "name": "Overview" },
-        "/projects/fix-swf/getting-started.html": { "name": "Getting Started" },
-        "#": { "name": "FAQ" },
-        "#": { "name": "Documentation" }
-      }
-    },
-    "#": { "name": "jquery.openx" },
-    "/projects/html-experimente.html": {
-      "name": "HTML-Experimente",
-      "childs": {
-        "/projects/html-experimente/formulare.html": { "name": "Formulare" },
-        "/projects/html-experimente/symbole.html": { "name": "Symbol-Font" },
-        "/templates/404.html": { "name": "404-Template" },
-        "/projects/html-experimente/gibts-ja-gar-nicht.html": { "name": "404-Fehlerseite" },
-        "/templates/error.html": { "name": "5xx-Template" },
-        "/projects/html-experimente/error.html": { "name": "5xx-Fehlerseite" },
-        "/projects/html-experimente/fast-leer-mit-menü.html": { "name": "Leer, mit Menü, ohne Marginal" },
-        "/projects/html-experimente/fast-leer-mit-menü-und-marginalinhalt.html": { "name": "Leer, mit Menü, mit Marginal" },
-        "/projects/html-experimente/fast-leer-kein-menü.html": { "name": "Leer, ohne Menü, ohne Marginal" },
-        "/projects/html-experimente/fast-leer-kein-menü-aber-marginalinhalt.html": { "name": "Leer, ohne Menü, mit Marginal" },
-        "/projects/html-experimente/fast-leer-einspaltig.html": { "name": "Leer, einspaltig" },
-        "/projects/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html": { "name": "Leer, einspaltig, mit Marginal" },
-        "/projects/html-experimente/breadcrumb.html": { "name": "Langer Breadcrumb" },
-        "/projects/html-experimente/kein-layout.html": { "name": "Alle Stylings deaktiviert" },
-        "/projects/html-experimente/basis-layout.html": { "name": "Nur das Basis-Layout" },
-        "/projects/html-experimente/druck-layout.html": { "name": "Druck-Layout" },
-        "/projects/html-experimente/tiny.html": { "name": "Layout TINY" },
-        "/projects/html-experimente/phone.html": { "name": "Layout PHONE" },
-        "/projects/html-experimente/tablet.html": { "name": "Layout TABLET" },
-        "/projects/html-experimente/seitenaufteilung.html": { "name": "Basis-Layout & Seitenaufteilung" },
-        "/projects/html-experimente/seitenkopf.html": { "name": "Basis-Layout & Seitenkopf" },
-        "/projects/html-experimente/testlab.html": { "name": "Media-Query-Test (Beispiel)" }
-      }
-    },
-    "#": { "name": "accelerator" },
-    "/projects/typo.html": { "name": "Typography" }
+  "menu": {
+    "/projects.html": {
+      "#": { "name": "hibernate4-maven-plugin" },
+      "/projects/fix-swf.html": {
+        "name": "Fix SWF",
+        "childs": {
+          "/projects/fix-swf/overview.html": { "name": "Overview" },
+          "/projects/fix-swf/getting-started.html": { "name": "Getting Started" },
+          "#": { "name": "FAQ" },
+          "#": { "name": "Documentation" }
+        }
+      },
+      "#": { "name": "jquery.openx" },
+      "/projects/html-experimente.html": {
+        "name": "HTML-Experimente",
+        "childs": {
+          "/projects/html-experimente/formulare.html": { "name": "Formulare" },
+          "/projects/html-experimente/symbole.html": { "name": "Symbol-Font" },
+          "/templates/404.html": { "name": "404-Template" },
+          "/projects/html-experimente/gibts-ja-gar-nicht.html": { "name": "404-Fehlerseite" },
+          "/templates/error.html": { "name": "5xx-Template" },
+          "/projects/html-experimente/error.html": { "name": "5xx-Fehlerseite" },
+          "/projects/html-experimente/fast-leer-mit-menü.html": { "name": "Leer, mit Menü, ohne Marginal" },
+          "/projects/html-experimente/fast-leer-mit-menü-und-marginalinhalt.html": { "name": "Leer, mit Menü, mit Marginal" },
+          "/projects/html-experimente/fast-leer-kein-menü.html": { "name": "Leer, ohne Menü, ohne Marginal" },
+          "/projects/html-experimente/fast-leer-kein-menü-aber-marginalinhalt.html": { "name": "Leer, ohne Menü, mit Marginal" },
+          "/projects/html-experimente/fast-leer-einspaltig.html": { "name": "Leer, einspaltig" },
+          "/projects/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html": { "name": "Leer, einspaltig, mit Marginal" },
+          "/projects/html-experimente/breadcrumb.html": { "name": "Langer Breadcrumb" },
+          "/projects/html-experimente/kein-layout.html": { "name": "Alle Stylings deaktiviert" },
+          "/projects/html-experimente/basis-layout.html": { "name": "Nur das Basis-Layout" },
+          "/projects/html-experimente/druck-layout.html": { "name": "Druck-Layout" },
+          "/projects/html-experimente/tiny.html": { "name": "Layout TINY" },
+          "/projects/html-experimente/phone.html": { "name": "Layout PHONE" },
+          "/projects/html-experimente/tablet.html": { "name": "Layout TABLET" },
+          "/projects/html-experimente/seitenaufteilung.html": { "name": "Basis-Layout & Seitenaufteilung" },
+          "/projects/html-experimente/seitenkopf.html": { "name": "Basis-Layout & Seitenkopf" },
+          "/projects/html-experimente/testlab.html": { "name": "Media-Query-Test (Beispiel)" }
+        }
+      },
+      "#": { "name": "accelerator" },
+      "/projects/typo.html": { "name": "Typography" }
+    }
   }
 }