From 64012f31af39eaa01dc0713ae54d1f5527010aa5 Mon Sep 17 00:00:00 2001 From: Xipas Date: Sun, 2 Oct 2016 17:12:30 +0100 Subject: [PATCH] Added menu generation from defenition on content.md files, selectable using params .createFromSiteMenusMain on toml file. (#5) Fixes #2 --- layouts/partials/header.html | 34 ++++++++++++++++++++++-------- layouts/partials/menu.html | 41 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 9 deletions(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 533ad0f55d..82873bc4c7 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -48,16 +48,32 @@ {{ if and (not .Params.chapter) (.Params.toc) }} {{ end }} - {{ $type := .Type }} - {{ $relLink := .RelPermalink }} - {{ range $name , $value := .Site.Sections }} - {{ if eq $name $type }} - {{ $first := (index $value 0).Page }} - {{ if ne $first.RelPermalink $relLink }} - + {{ if $page.Site.Params.createFromSiteMenusMain}} + {{ $type := .Params.menu.main.parent }} + {{ $relLink := .RelPermalink }} + {{ range $name , $value := .Site.Menus.main }} + + {{ if eq $value.Identifier $type }} + {{ if ne $relLink $value.URL }} + + {{ end }} + {{ end }} {{ end }} - {{ end }} - {{ end }} + + {{else}} + + {{ $type := .Type }} + {{ $relLink := .RelPermalink }} + {{ range $name , $value := .Site.Sections }} + {{ if eq $name $type }} + {{ $first := (index $value 0).Page }} + {{ if ne $first.RelPermalink $relLink }} + + {{ end }} + {{ end }} + {{ end }} + {{end}} + {{ with .Title }} {{ . }}{{ end }} {{ if .Params.toc }} diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index c5d4fd78e2..b07494281c 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -16,6 +16,42 @@

{{ if .Site.Params.showVisitedLinks}}