hotfix: updated nested menu partial

pull/1251/head
Scott Anderson 2020-07-28 12:59:46 -06:00
parent c0a3dad2fd
commit c8da1e7585
2 changed files with 13 additions and 9 deletions

View File

@ -25,11 +25,11 @@
{{ $refMenu := (index .Site.Menus (print (replaceRE "[.]" "_" $currentVersion) "_ref")) }} {{ $refMenu := (index .Site.Menus (print (replaceRE "[.]" "_" $currentVersion) "_ref")) }}
<!-- Main Section --> <!-- Main Section -->
{{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $mainMenu) }} {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $mainMenu) . }}
<!-- Reference Section --> <!-- Reference Section -->
<h4 class="reference">Reference</h4> <h4 class="reference">Reference</h4>
{{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $refMenu) }} {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $refMenu) . }}
</ul> </ul>
</aside> </aside>

View File

@ -1,40 +1,44 @@
{{ $page := .page }} {{ $page := .page }}
{{ $menu := .menu }} {{ $menu := .menu }}
{{ define "productTag" }}
{{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}
{{ end }}
{{ range $menu }} {{ range $menu }}
<li class="nav-category {{ if eq $page.RelPermalink .URL }}active{{end}}"> <li class="nav-category {{ if eq $page.RelPermalink .URL }}active{{end}}">
{{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }} {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
<a href="{{ .URL }}">{{ .Name }} {{ if .Page.Params.products }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a> <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
{{ if .HasChildren }} {{ if .HasChildren }}
<ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"> <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
{{ range .Children }} {{ range .Children }}
<li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}"> <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
{{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }} {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
<a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a> <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
{{ if .HasChildren }} {{ if .HasChildren }}
<ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"> <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
{{ range .Children }} {{ range .Children }}
<li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}"> <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
{{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }} {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
<a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a> <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
{{ if .HasChildren }} {{ if .HasChildren }}
<ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"> <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
{{ range .Children }} {{ range .Children }}
<li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}"> <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
{{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }} {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
<a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a> <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
{{ if .HasChildren }} {{ if .HasChildren }}
<ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"> <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
{{ range .Children }} {{ range .Children }}
<li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}"> <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
{{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }} {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
<a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a> <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
{{ if .HasChildren }} {{ if .HasChildren }}
<ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"> <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
{{ range .Children }} {{ range .Children }}
<li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}"> <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
{{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }} {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
<a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a> <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
<!-- Begin nested block --> <!-- Begin nested block -->
{{ if .HasChildren }} {{ if .HasChildren }}
@ -42,7 +46,7 @@
{{ range .Children }} {{ range .Children }}
<li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}"> <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
{{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }} {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
<a href="{{ .URL }}">{{ .Name }} {{ if and (.Page.Params.products) (not .Page.Parent.Params.products) }}{{ range .Page.Params.products }}<span class="{{ . }}"></span>{{ end }}{{ end }}</a> <a href="{{ .URL }}">{{ .Name }} {{ template "productTag" . }}</a>
<!-- To add more nested layers, copy the nested block and paste it here --> <!-- To add more nested layers, copy the nested block and paste it here -->
</li> </li>
{{ end }} {{ end }}