WIP:layout:menu

diff --git a/layouts/_partials/menu.html b/layouts/_partials/menu.html
index c3e7bf60f928d5165086c7d862c791149f04f2d3..96314a66c1b0fb74ddef7a6053b015b3a409171e 100644 (file)
--- a/layouts/_partials/menu.html
+++ b/layouts/_partials/menu.html
@@ -17,16 +17,15 @@
   <h2 class="nav submenu">
     <a class="s selected" href="{{ site.Home.RelPermalink }}">Home</a>
   </h2>
-  <ul class="submenu selected">
+  <ul id="submenu" class="submenu selected">
   {{- partial "inline/menu/tree.html" (dict "pages" $page.Site.Sections "current" $page) }}
   {{- define "_partials/inline/menu/tree.html" }}
   {{- $current := .current -}}
-  {{- $pages := .pages -}}
-    {{- range $pages }}
+    {{- range .pages }}
       {{- $isCurrent := eq . $current -}}
       {{- $isAncestor := $current.IsDescendant . -}}
       <li
-        class="s{{ if or $current.Pages $current.Sections}} sub{{ end }}">
+        class="s{{ if or .Pages .Sections}} sub{{ end }}{{ if not (or (eq $current .) ($current.IsDescendant .))}} off{{ end }}">
       <!--
         th:with="
             child=${pos == len},
@@ -40,10 +39,8 @@
         class="s sub"
         th:class="'s' + (${childs} ? ' sub' : '') + (${selected or sibling or child} ? '' : ' off')"
       -->
-        <a href="{{ .RelPermalink }}">
-          {{ .Title }}
-        </a>
-  <ul class="submenu{{ if (or $isCurrent $isAncestor) }} selected{{ end }}">
+        <a href="{{ .RelPermalink }}" class="s {{ if (or $isCurrent $isAncestor) }} selected{{ end }}">{{ .Title }}</a>
+  <ul class="submenu{{ if (or $isCurrent $isAncestor) }} active{{ end }}">
         {{- if .Pages }}
           {{- partial "inline/menu/tree.html" (dict
               "pages" .Pages
@@ -62,7 +59,6 @@
         parent=${section},
         submenu=${_childs.get(parent)},
         pos=2"
-      id="submenu"
       class="s"
       th:class="'s' + (${len == 1 or (len == 2 and _childs.get(uri) == null)} ? ' selected' : '')"
       >