Struktur der Daten für das Menü überarbeitet

[website] / dist / templates / layout.html
diff --git a/dist/templates/layout.html b/dist/templates/layout.html

index caaca4a..54fd8fb 100644 (file)
--- a/dist/templates/layout.html
+++ b/dist/templates/layout.html
@@ -26,7 +26,7 @@
      <script src="../js/less-1.7.0.min.js" th:remove="all"></script>
    </head>
    <body
-      th:with="crumbs=${crumbs.get(uri)}"
+      th:with="page=${pages.get(uri)},crumbs=${page.crumbs}"
        id="top"
        class="menu"
        th:class="${contentclass}?:'menu'"
@@ -124,8 +124,8 @@
              </h2>
              <ul layout:fragment="submenu"
                  th:with="
-                  submenu=${menu[section.uri]},
-                  parent=${(crumbs.size() == 2 and submenu.get(uri)['childs'] == null) ? crumbs[0].uri : null},
+                  submenu=${pages[section.uri]['childs']},
+                  parent=${crumbs[0].uri},
                    pos=1"
                  id="submenu"
                  class="s"
@@ -135,17 +135,17 @@
                    th:with="
                        child=${pos == crumbs.size()},
                        selected=${!child and crumbs.get(pos).uri == entry.key},
-                      last=${crumbs.get(pos-1).uri == parent and crumbs.size() &gt; pos},
-                      childs=${entry.value['childs']}
+                      sibling=${pos + 1 == crumbs.size() and (page['childs'] == null or uri == parent)},
+                      childs=${entry.key == parent ? null : pages[entry.key]['childs']}
                        "
                    class="s sub"
-                  th:class="'s' + (${childs} ? ' sub' : '') + (${selected or last or child} ? '' : ' off')"
+                  th:class="'s' + (${childs} ? ' sub' : '') + (${selected or sibling or child} ? '' : ' off')"
                    >
                  <a  href="../projects/fix-swf.html"
                      th:href="@{${entry.key}}"
                      class="s selected"
                      th:class="${selected} ? 's selected' : 's'"
-                    th:text="${entry.value.name}"
+                    th:text="${entry.value}"
                      >fix-swf</a>
                  <ul th:if="${selected and childs != null}"
                      class="s active"