From 7a0e742def494eee80a9b6fcd069f92b0ce5abac Mon Sep 17 00:00:00 2001
From: Aditya Telange <21258296+adityatelange@users.noreply.github.com>
Date: Tue, 1 Dec 2020 13:58:16 +0530
Subject: [PATCH] header: improve menu location indicator

- fix non-highlight on subdirs
- menu url need not have leading or trailing slashes
- fix non-highlight with multilingual config
---
 layouts/partials/header.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 9074b13c..6579922d 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -109,12 +109,11 @@
         {{- $currentPage := . }}
         <ul class="menu" id="menu" onscroll="menu_on_scroll()">
             {{- range .Site.Menus.main }}
-            {{- $menu_item_url := .URL | relLangURL }}
-            {{- $page_url:= $currentPage.RelPermalink | relLangURL }}
+            {{- $menu_item_url := (cond (strings.HasSuffix .URL "/") .URL (printf "%s/" .URL) ) | absLangURL }}
+            {{- $page_url:= $currentPage.Permalink  | absLangURL }}
             <li>
-                <a href="{{ .URL | absLangURL }}">
-                    <span {{- if eq $menu_item_url $page_url }}
-                        {{- /* the menu item links to the current page (with relLangURL) */}} class="active" {{- end }}>
+                <a href="{{ $menu_item_url }}">
+                    <span {{- if eq $menu_item_url $page_url }} class="active" {{- end }}>
                         {{ .Name }}
                     </span>
                 </a>