From 27d3d64e50c3a5f7c4e438f43f574b77f4ad682b Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Fri, 3 Jan 2020 11:30:34 +0100
Subject: [PATCH] Build menus from .Site.Menus.main if it exists, otherwise
 build it automatically with home and sections as before.

---
 layouts/partials/menu.html       | 17 ++++++++++++++---
 layouts/partials/mobilemenu.html | 17 ++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 4bad551..54caa71 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,15 +1,26 @@
-{{ $currentSection := .Section -}}
-{{ $currentID := "" -}}
-{{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 <nav class="main-menu layout__navigation">
 <h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
 <ul class="navbar">
+{{ if .Site.Menus.main -}}
+
+{{ $currentPage := . -}}
+{{ range .Site.Menus.main -}}
+<li><a href="{{ .URL }}"{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} class="active" aria-current="page"{{ end }}>{{ .Name }}</a></li>
+{{ end -}}
+
+{{ else -}}
+
+{{ $currentSection := .Section -}}
+{{ $currentID := "" -}}
+{{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 {{ with .Site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ end }}
 {{ range where .Site.RegularPages "Section" "" -}}
 <li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
 {{ end -}}
 {{ range .Site.Sections -}}
 <li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
+{{ end -}}
+
 {{ end -}}
 </ul>
 </nav>
diff --git a/layouts/partials/mobilemenu.html b/layouts/partials/mobilemenu.html
index af45ab8..96f9088 100644
--- a/layouts/partials/mobilemenu.html
+++ b/layouts/partials/mobilemenu.html
@@ -1,6 +1,3 @@
-{{ $currentSection := .Section -}}
-{{ $currentID := "" -}}
-{{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 <div class="mobile-nav" dir="ltr">
   <div class="mobile-nav__cover"></div>
   <a href="#navigation" class="mobile-nav__toggle" aria-haspopup="true" role="button">{{ i18n "menu_mobile" }}</a>
@@ -12,12 +9,26 @@
     <nav class="mobile-nav__main-menu">
     <h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
     <ul class="mobile-nav__navbar">
+    {{ if .Site.Menus.main -}}
+
+    {{ $currentPage := . -}}
+    {{ range .Site.Menus.main -}}
+    <li><a href="{{ .URL }}"{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} class="active" aria-current="page"{{ end }}>{{ .Name }}</a></li>
+    {{ end -}}
+
+    {{ else -}}
+
+    {{ $currentSection := .Section -}}
+    {{ $currentID := "" -}}
+    {{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
     {{ with .Site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ end }}
     {{ range where .Site.RegularPages "Section" "" -}}
     <li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
     {{ end -}}
     {{ range .Site.Sections -}}
     <li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
+    {{ end -}}
+
     {{ end -}}
     </ul>
     </nav>