diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 16f6ffc141..3902b7741a 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,3 +1,5 @@ +{{ if .Content }} {{ partial "header.html" . }} {{ .Content }} {{ partial "footer.html" . }} +{{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index ffc2b6922f..40bbb5f6e5 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,17 +1,27 @@ - {{ if eq .Kind "section" }} + {{ $isChapter := or (eq .Kind "section") (.Params.chapter)}} + {{ if $isChapter }} {{ end }} {{ $.Scratch.Set "_sectionpages" (slice) }} - {{ range $sname, $spages := .Site.Sections }} - {{ $.Scratch.Add "_sectionpages" ($.Site.GetPage "section" $sname) }} + {{ if $.Site.Params.menu }} + {{ range $sname := $.Site.Params.menu }} + {{ $.Scratch.Add "_sectionpages" ($.Site.GetPage "section" $sname) }} + {{ end }} + {{ else }} + {{ range $sname, $spages := .Site.Sections }} + {{ $.Scratch.Add "_sectionpages" ($.Site.GetPage "section" $sname) }} + {{ end }} + {{ $.Scratch.Set "_sectionpages" (sort ($.Scratch.Get "_sectionpages") "Weight") }} {{ end }} {{ $.Scratch.Set "_allpages" (slice) }} - {{ range sort ($.Scratch.Get "_sectionpages") "Weight" }} - {{ $.Scratch.Add "_allpages" . }} + {{ range $.Scratch.Get "_sectionpages" }} + {{ if .Content }} + {{ $.Scratch.Add "_allpages" . }} + {{ end }} {{ range index $.Site.Sections .Section }} {{ $.Scratch.Add "_allpages" .Page }} {{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 12ee292785..7de4a5924c 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -22,6 +22,7 @@ {{ partial "style.html" . }} + {{ $isChapter := or (eq .Kind "section") (.Params.chapter)}} {{ partial "menu.html" . }}
@@ -47,7 +48,7 @@ - {{ if and (ne .Kind "section") (.Params.toc) }} + {{ if and (not $isChapter) (.Params.toc) }} {{ end }} {{ $type := .Type }} @@ -67,10 +68,10 @@ {{ end }} - {{ if eq .Kind "section" }} + {{ if $isChapter }}
{{ end }}
- {{ if ne .Kind "section" }} + {{ if not $isChapter }}

{{.Title}}

{{ end }} diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index 4ad79f2177..6b11ea63c1 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -12,23 +12,34 @@
    {{ $page := . }} - {{ $.Scratch.Set "_pages" (slice) }} - {{ range $key, $value := .Site.Sections }} - {{ $.Scratch.Add "_pages" ($.Site.GetPage "section" $key) }} - {{ end }} - {{ $.Scratch.Set "menuItems" (slice)}} - {{ range $key, $value := sort ($.Scratch.Get "_pages") "Weight" }} - {{ $.Scratch.Add "menuItems" $value.Section }} + {{ if $.Site.Params.menu }} + {{ $.Scratch.Set "menuItems" $.Site.Params.menu }} + {{ else }} + {{ $.Scratch.Set "_pages" (slice) }} + {{ range $key, $value := .Site.Sections }} + {{ $.Scratch.Add "_pages" ($.Site.GetPage "section" $key) }} + {{ end }} + {{ $.Scratch.Set "menuItems" (slice)}} + {{ range $key, $value := sort ($.Scratch.Get "_pages") "Weight" }} + {{ $.Scratch.Add "menuItems" $value.Section }} + {{ end }} {{ end }} {{ $menuItems := $.Scratch.Get "menuItems" }} {{ range $i, $key := $menuItems }} {{ if ne $key "" }} {{ $value := (index $page.Site.Sections $key) }} + {{ $.Scratch.Set "_value" $value }} {{ with $index := $.Site.GetPage "section" $key }} - {{ $.Scratch.Set "first" $index }} + {{ if .Content }} + {{ $.Scratch.Set "first" $index }} + {{ else }} + {{ $.Scratch.Set "first" (index $value 0).Page }} + {{ $.Scratch.Set "_value" (after 1 $value) }} + {{ end }} {{ end }} {{ $first := $.Scratch.Get "first" }} + {{ $value := $.Scratch.Get "_value" }}