WIP:layout:menu

diff --git a/layouts/_partials/menu.html b/layouts/_partials/menu.html
index 0669b2402c1ba5beca0a0c8bf91389c9c1395925..a8d39bd130173143c78310cef85c117c480c766e 100644 (file)
--- a/layouts/_partials/menu.html
+++ b/layouts/_partials/menu.html
@@ -27,7 +27,7 @@
     {{- $isAncestor := $page.IsDescendant . -}}
     {{- $isChild := $parent.Eq $page }}
     {{- $isSibling := $parent.Eq (index $page.Ancestors 0) }}
-    <li class="s{{ if or .Pages .Sections}} sub{{ end }}{{ if not (or $isAncestor $isSibling $isChild) }} off{{ end }}">
+    <li class="s{{ if or .Pages .Sections}} sub{{ end }}{{ if not (or $isCurrent $isAncestor (and $isSibling (not $page.IsNode)) $isChild) }} off{{ end }}">
       <!--
         th:with="
             child=${pos == len},
@@ -44,16 +44,21 @@
       <a  href="{{ .RelPermalink }}"
           class="s {{ if (or $isCurrent $isAncestor) }} selected{{ end }}"
           >{{ .LinkTitle }}</a>
-      <!-- .: {{ .Path }} -->
-      <!-- $parent: {{ $parent.Path }} -->
-      <!-- $page: {{ $page.Path }} -->
-      <!-- $isCurrent: {{ $isCurrent }} -->
-      <!-- $isAncestor: {{ $isAncestor }} -->
-      <!-- $isSibling: {{ $isSibling }} -->
-      <!-- $isChild: {{ $isChild }} -->
-      <!-- .Eq $page: {{ .Eq $page }} -->
-      <!-- .IsAncestor $page: {{ .IsAncestor $page }} -->
-      <!-- .IsDescendant $page: {{ .IsDescendant $page }} -->
+      <!--
+      <ul>
+        <li>.: {{ .Path }}</li>
+        <li>$parent: {{ $parent.Path }}</li>
+        <li>$page: {{ $page.Path }}</li>
+        <li>$page.IsNode: {{ $page.IsNode }}</li>
+        <li>$isCurrent: {{ $isCurrent }}</li>
+        <li>$isAncestor: {{ $isAncestor }}</li>
+        <li>$isSibling: {{ $isSibling }}</li>
+        <li>$isChild: {{ $isChild }}</li>
+        <li>.Eq $page: {{ .Eq $page }}</li>
+        <li>.IsAncestor $page: {{ .IsAncestor $page }}</li>
+        <li>.IsDescendant $page: {{ .IsDescendant $page }}</li>
+      </ul>
+      -->
       {{ if or .Pages .Sections }}
       <ul class="s{{ if (or $isCurrent $isAncestor) }} active{{ end }}">
         {{- if .Pages }}