WIP:layout:menu

diff --git a/layouts/_partials/menu.html b/layouts/_partials/menu.html
index f39ae01dcf0386a4067f23b965dcc42aeb5d078a..e097ffdfcd3aebf297abdd3d52c1dbc677bc4f60 100644 (file)
--- a/layouts/_partials/menu.html
+++ b/layouts/_partials/menu.html
@@ -1,3 +1,15 @@
+{{- /*
+Renders a menu for the given menu ID.
+
+@context {page} page The current page.
+@context {string} menuID The menu ID.
+
+@example: {{ partial "menu.html" (dict "menuID" "main" "page" .) }}
+*/}}
+
+{{- $page := .page }}
+{{- $menuID := .menuID }}
+
 <nav id="nav"
     th:include="~{::#navigation}?:_"
     th:with="section=${crumbs != null && crumbs.size() > 1 ? crumbs[1] : null}"
@@ -26,6 +38,12 @@
     <span class="s">Submenu for section</span>
     <a class="s selected" href="../projects.html" th:href="@{${section}}" th:text="${_titles.get(section)}">Projects</a>
   </h2>
+  {{- with index site.Menus $menuID }}
+  <ul id="submenu" class="s selected">
+    {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
+  </ul>
+  {{- end }}
+
   <ul th:include="${submenu}?:_"
       th:with="
         len=${crumbs == null} ? 0 : ${crumbs.size()},
@@ -56,7 +74,7 @@
           class="s selected"
           th:class="(${selected} ? 's selected' : 's') + ' len_' + ${len} + ' pos_' + ${pos} + (${leaf}?' leaf':'')"
           th:text="${_titles.get(entry)}"
-          >fix-swf</a>
+          >Hallo Weltf</a>
       <ul th:if="${selected and childs != null}"
           class="s active"
           th:class="'s' + (${entry == uri or (len &gt; 1 and entry == crumbs.get(len-2) and _childs.get(uri) == null)} ? ' selected' : '')"
@@ -84,26 +102,6 @@
   </ul>
   <hr class="n"/>
 </nav>
-{{- /*
-Renders a menu for the given menu ID.
-
-@context {page} page The current page.
-@context {string} menuID The menu ID.
-
-@example: {{ partial "menu.html" (dict "menuID" "main" "page" .) }}
-*/}}
-
-{{- $page := .page }}
-{{- $menuID := .menuID }}
-
-{{- with index site.Menus $menuID }}
-  <nav>
-    <ul>
-      {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
-    </ul>
-  </nav>
-{{- end }}
-
 {{- define "_partials/inline/menu/walk.html" }}
   {{- $page := .page }}
   {{- range .menuEntries }}
@@ -119,7 +117,7 @@ Renders a menu for the given menu ID.
         {{- $name = . }}
       {{- end }}
     {{- end }}
-    <li>
+    <li class="s sub"><!-- sub? off? -->
       <a
         {{- range $k, $v := $attrs }}
           {{- with $v }}
@@ -128,7 +126,7 @@ Renders a menu for the given menu ID.
         {{- end -}}
       >{{ $name }}</a>
       {{- with .Children }}
-        <ul>
+        <ul class="submenu"><!-- selected? -->
           {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
         </ul>
       {{- end }}