diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index 268fa5d94e..69fca56271 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -138,7 +138,7 @@ {{- $relearnIsHiddenFrom := index ($currentNode.Scratch.Get "relearnIsHiddenFrom") .RelPermalink }} {{- $hidden := and $relearnIsHiddenFrom (not $.showhidden) (not $isSelf) (not $isAncestor) }} {{- if $hidden }} - {{- else if or .IsSection .IsHome }} + {{- else }} {{- $numberOfVisibleChildren := 0 }} {{- range $pages }} {{- $isSelfSub := eq .RelPermalink $currentFileRelPermalink }} @@ -155,27 +155,23 @@ {{- $pageHash := md5 .Page }} {{- $isOpen := or $currentAlwaysopen $isSelf $isAncestor }}
  • {{ if .Site.Params.collapsibleMenu }}{{ end }} - {{- partial "menu-pre.html" . }}{{ or .Params.menuTitle .LinkTitle .Title }}{{ partial "menu-post.html" . }} - {{- if $showvisitedlinks }}{{ end }}
  • + {{- partial "menu-pre.html" . }}{{ or .Params.menuTitle .LinkTitle .Title }}{{ partial "menu-post.html" . }} + {{- if $showvisitedlinks }}{{ end }} + {{- else }}
  • {{- partial "menu-pre.html" . }}{{ or .Params.menuTitle .LinkTitle .Title }}{{ partial "menu-post.html" . }} {{- if $showvisitedlinks }}{{ end }}
  • + {{- end }} {{- end }} {{- end }} {{- end }} \ No newline at end of file diff --git a/layouts/partials/nested-article.hugo b/layouts/partials/nested-article.hugo index 4a7340c5a9..d3be53c5dc 100644 --- a/layouts/partials/nested-article.hugo +++ b/layouts/partials/nested-article.hugo @@ -59,7 +59,7 @@ {{- $relearnIsHiddenFrom := index ($currentNode.Scratch.Get "relearnIsHiddenFrom") .RelPermalink }} {{- $hidden := and $relearnIsHiddenFrom (not $.showhidden) (not $isSelf) (not $isAncestor) }} {{- if $hidden }} - {{- else if or .IsSection .IsHome }} + {{- else }} {{- $defaultOrdersectionsby := .Site.Params.ordersectionsby | default "weight" }} {{- $currentOrdersectionsby := .Params.ordersectionsby | default $defaultOrdersectionsby }} {{- if $isActive }} @@ -83,10 +83,6 @@ {{- end }} {{- end }} - {{- else }} - {{- if $isActive }} - {{- template "section-print" dict "sect" . "currentnode" $currentNode }} - {{- end }} {{- end }} {{- end }} {{- end }}