Fix bug from last commit that replaces check for currentID for currentSection for pages in menus.
This commit is contained in:
parent
1602176e73
commit
8971d752bb
3 changed files with 5 additions and 5 deletions
|
|
@ -4,9 +4,9 @@
|
||||||
<nav class="main-menu layout__navigation">
|
<nav class="main-menu layout__navigation">
|
||||||
<h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
|
<h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
|
||||||
<ul class="navbar">
|
<ul class="navbar">
|
||||||
{{ with .Site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ 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" "" -}}
|
{{ range where .Site.RegularPages "Section" "" -}}
|
||||||
<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
{{ range .Site.Sections -}}
|
{{ range .Site.Sections -}}
|
||||||
<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
||||||
|
|
|
||||||
|
|
@ -12,9 +12,9 @@
|
||||||
<nav class="mobile-nav__main-menu">
|
<nav class="mobile-nav__main-menu">
|
||||||
<h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
|
<h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
|
||||||
<ul class="mobile-nav__navbar">
|
<ul class="mobile-nav__navbar">
|
||||||
{{ with .Site.Home }}<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ i18n "menu_home" }}</a></li>{{ 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" "" -}}
|
{{ range where .Site.RegularPages "Section" "" -}}
|
||||||
<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
{{ range .Site.Sections -}}
|
{{ range .Site.Sections -}}
|
||||||
<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
<h4 class="menu"><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></h4>
|
<h4 class="menu"><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></h4>
|
||||||
<ul class="menu">
|
<ul class="menu">
|
||||||
{{ range .Pages -}}
|
{{ range .Pages -}}
|
||||||
<li><a href="{{ .RelPermalink }}"{{ if eq $currentSection .Section }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
<li><a href="{{ .RelPermalink }}"{{ if eq $currentID .File.UniqueID }} class="active" aria-current="page"{{ end }}>{{ .Title }}</a></li>
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
</ul>
|
</ul>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue