diff options
| author | Robert Austin <rob@jugglerdigital.com> | 2022-08-25 12:34:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 12:34:49 +0300 |
| commit | e9f3e8121a61516d1aee7a968cb542a3228e2d45 (patch) | |
| tree | 35470371271d69d4221b79546acc05d4db51b7da | |
| parent | 10be5ee1b66696bba6a18656c6953282c7da6cbd (diff) | |
| parent | 0ced620b62e96aaee7e0b4d4373a99d33673a8fc (diff) | |
Merge pull request #60 from joelpet/fix-page-not-marked-active
Fix home page not marked as active in menu
| -rw-r--r-- | layouts/partials/footer-menu.html | 2 | ||||
| -rw-r--r-- | layouts/partials/main-menu-mobile.html | 4 | ||||
| -rw-r--r-- | layouts/partials/main-menu.html | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/layouts/partials/footer-menu.html b/layouts/partials/footer-menu.html index 6ec4094..b2a2817 100644 --- a/layouts/partials/footer-menu.html +++ b/layouts/partials/footer-menu.html @@ -3,7 +3,7 @@ {{ $currentPage := . }} {{ range .Site.Menus.footer }} {{ $active := or ($currentPage.IsMenuCurrent "footer" .) ($currentPage.HasMenuCurrent "footer" .) }} - {{ $active = or $active (eq .Name $currentPage.Title) }} + {{ $active = or $active (eq (.URL | relLangURL) ($currentPage.RelPermalink | relLangURL)) }} <li class="menu-item-{{ .Name | lower }} {{ if $active }}active{{ end }}"> <a href="{{.URL}}"> {{ .Pre }} diff --git a/layouts/partials/main-menu-mobile.html b/layouts/partials/main-menu-mobile.html index 5211ea7..5b6e2a2 100644 --- a/layouts/partials/main-menu-mobile.html +++ b/layouts/partials/main-menu-mobile.html @@ -2,7 +2,9 @@ <ul> {{ $currentPage := . }} {{ range .Site.Menus.main }} - <li class="menu-item-{{ .Name | lower }}{{ if $currentPage.IsMenuCurrent "main" . }} active{{ end }}"> + {{ $active := or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} + {{ $active = or $active (eq (.URL | relLangURL) ($currentPage.RelPermalink | relLangURL)) }} + <li class="menu-item-{{ .Name | lower }} {{ if $active }}active{{ end }}"> <a href="{{ .URL }}"> <span>{{ .Name }}</span> </a> diff --git a/layouts/partials/main-menu.html b/layouts/partials/main-menu.html index 00a7dc0..3951cf7 100644 --- a/layouts/partials/main-menu.html +++ b/layouts/partials/main-menu.html @@ -3,7 +3,7 @@ {{ $currentPage := . }} {{ range .Site.Menus.main }} {{ $active := or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} - {{ $active = or $active (eq .Name $currentPage.Title) }} + {{ $active = or $active (eq (.URL | relLangURL) ($currentPage.RelPermalink | relLangURL)) }} <li class="menu-item-{{ .Name | lower }} {{ if $active }}active{{ end }}"> <a href="{{.URL}}"> {{ .Pre }} |