flyrain commented on code in PR #347:
URL: https://github.com/apache/polaris/pull/347#discussion_r1799970242
##########
site/layouts/partials/navbar.html:
##########
@@ -23,100 +23,102 @@
{{ $baseURL := urls.Parse $.Site.Params.Baseurl -}}
<nav class="td-navbar js-navbar-scroll
- {{- if $cover }} td-navbar-cover {{- end }}" data-bs-theme="dark">
-<div class="container-fluid flex-column flex-md-row">
- <a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
- {{- /**/ -}}
- <span class="navbar-brand__logo navbar-logo">
- {{- if ne .Site.Params.ui.navbar_logo false -}}
- {{ with resources.Get "icons/logo.svg" -}}
- {{ ( . | minify).Content | safeHTML -}}
- {{ end -}}
- {{ end -}}
- </span>
- {{- /**/ -}}
- <span class="navbar-brand__name">
- {{- /* .Site.Title */ -}}
- </span>
- {{- /**/ -}}
- </a>
- <div class="td-navbar-nav-scroll ms-md-auto" id="main_navbar">
- <ul class="navbar-nav">
- {{ $p := . -}}
- {{ $s := .Site -}}
- {{ range .Site.Menus.main -}}
- {{ if .HasChildren }}
- {{/*
- Customized to have drop-down menus in the navbar and 'Releases' not at
the very right
- */}}
- <div class="dropdown">
- <a class="nav-link dropdown-toggle" href="#" role="button"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- {{- .Pre -}}
- <span>{{ .Name }}</span>
- </a>
- <ul class="dropdown-menu">
- {{ $children := .Children.ByWeight -}}
- {{ if eq .Identifier "releases" -}}
- {{ with (partial "releasePages.html" (dict "site" $s)).active -}}
- {{ range . -}}
- <a class="dropdown-item" href="{{ .RelPermalink }}">{{
.Params.LinkTitle | default .Params.Title }}</a>
- {{- end -}}
- {{ else -}}
- {{ $children = where .Children.ByWeight "Identifier" "ne"
"all-releases-page" -}}
- {{ end -}}
- {{ end -}}
- {{ range $children -}}
- <a class="dropdown-item" href="{{ .URL }}">{{ .Name }}</a>
- {{- end -}}
- </ul>
- </div>
- {{ else -}}
- {{/*
- Customized to allow hiding items from the navbar
- */}}
- {{ if ne .Page.Params.top_hidden true -}}
- <li class="nav-item">
- {{ $active := or ($p.IsMenuCurrent "main" .) ($p.HasMenuCurrent "main"
.) -}}
- {{ $href := "" -}}
- {{ with .Page -}}
- {{ $active = or $active ( $.IsDescendant .) -}}
- {{ $href = .RelPermalink -}}
- {{ else -}}
- {{ $href = .URL | relLangURL -}}
- {{ end -}}
- {{ $isExternal := ne $baseURL.Host (urls.Parse .URL).Host -}}
- <a {{/**/ -}}
- class="nav-link {{- if $active }} active {{- end }}" {{/**/ -}}
- href="{{ $href }}"
- {{- if $isExternal }} target="_blank" rel="noopener" {{- end -}}
- >
- {{- .Pre -}}
+ {{ if $cover }} td-navbar-cover {{ end }}" data-bs-theme="dark">
+ <div class="container-fluid flex-column flex-md-row">
+ <a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
+ <span class="navbar-brand__logo navbar-logo">
+ {{ if ne .Site.Params.ui.navbar_logo false }}
+ {{ with resources.Get "icons/logo.svg" }}
+ {{ (. | minify).Content | safeHTML }}
+ {{ end }}
+ {{ end }}
+ </span>
+ </a>
+ <div class="td-navbar-nav-scroll ms-md-auto" id="main_navbar">
+ <ul class="navbar-nav">
+ {{ $p := . }}
+ {{ $s := .Site }}
+ {{ range .Site.Menus.main }}
+ {{ if .HasChildren }}
+ <!-- Menu items with children -->
+ <div class="dropdown">
+ <a class="nav-link dropdown-toggle" href="#" role="button"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ {{ .Pre }}
<span>{{ .Name }}</span>
- {{- .Post -}}
- </a>
- </li>
- {{ end -}}
- {{ end -}}
- {{ end -}}
- {{ if .Site.Params.versions -}}
- <li class="nav-item dropdown d-none d-lg-block">
- {{ partial "navbar-version-selector.html" . -}}
- </li>
- {{ end -}}
- {{ if (gt (len .Site.Home.Translations) 0) -}}
- <li class="nav-item dropdown d-none d-lg-block">
- {{ partial "navbar-lang-selector.html" . -}}
- </li>
- {{ end -}}
- {{ if .Site.Params.ui.showLightDarkModeMenu -}}
- <li class="td-light-dark-menu nav-item dropdown">
- {{ partial "theme-toggler" . }}
- </li>
- {{ end -}}
- </ul>
- </div>
- <div class="d-none d-lg-block">
- {{ partial "search-input.html" . }}
+ </a>
+ <ul class="dropdown-menu">
+ {{ $children := .Children.ByWeight }}
+ {{ if eq .Identifier "releases" }}
+ {{ with (partial "releasePages.html" (dict "site" $s)).active }}
+ {{ range . }}
+ <a class="dropdown-item" href="{{ .RelPermalink }}">{{
.Params.LinkTitle | default .Params.Title }}</a>
+ {{ end }}
+ {{ else }}
+ {{ $children = where .Children.ByWeight "Identifier" "ne"
"all-releases-page" }}
+ {{ end }}
+ {{ end }}
+ {{ range $children }}
+ <a class="dropdown-item" href="{{ .URL }}">{{ .Name }}</a>
+ {{ end }}
+ </ul>
+ </div>
+ {{ else }}
+ <!-- Menu items without children -->
Review Comment:
Hi @snazy , removed the formatting changes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
