From a3c9466db1a6183947bc7ff1304267a059344e1a Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 30 Jul 2020 11:34:57 -0600 Subject: [PATCH] restructured top nav partials --- layouts/_default/list.html | 1 + layouts/_default/section.html | 3 ++- layouts/_default/single.html | 1 + layouts/_default/tags-landing.html | 1 + layouts/_default/version-landing.html | 1 + layouts/partials/header.html | 1 - layouts/partials/topnav.html | 19 +------------------ 7 files changed, 7 insertions(+), 20 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e45ddd049..80b6d4cda 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,4 +1,5 @@ {{ partial "header.html" . }} +{{ partial "topnav.html" . }}
{{ partial "sidebar.html" . }} diff --git a/layouts/_default/section.html b/layouts/_default/section.html index fa7e6f2b5..d1a451781 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -1,4 +1,5 @@ -{{ partial "header.html" . }} +{{ partial "header.html" . }}\ +{{ partial "topnav.html" . }}
{{ partial "sidebar.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index fa7e6f2b5..3d220b47a 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,4 +1,5 @@ {{ partial "header.html" . }} +{{ partial "topnav.html" . }}
{{ partial "sidebar.html" . }} diff --git a/layouts/_default/tags-landing.html b/layouts/_default/tags-landing.html index 0456ff1d2..1180f0788 100644 --- a/layouts/_default/tags-landing.html +++ b/layouts/_default/tags-landing.html @@ -1,4 +1,5 @@ {{ partial "header.html" . }} +{{ partial "topnav.html" . }}
{{ partial "sidebar.html" . }} diff --git a/layouts/_default/version-landing.html b/layouts/_default/version-landing.html index 445223099..5b632b656 100644 --- a/layouts/_default/version-landing.html +++ b/layouts/_default/version-landing.html @@ -1,4 +1,5 @@ {{ partial "header.html" . }} +{{ partial "topnav.html" . }} {{ $productPathData := findRE "[^/]+.*?" .RelPermalink }} {{ $product := index $productPathData 0 }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 0af368446..d8b3846e3 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -31,4 +31,3 @@ {{ partial "header/google-analytics-body.html" }} - {{ partial "topnav.html" . }} diff --git a/layouts/partials/topnav.html b/layouts/partials/topnav.html index baacd7afd..4321556a4 100644 --- a/layouts/partials/topnav.html +++ b/layouts/partials/topnav.html @@ -1,7 +1,3 @@ -{{ $productPathData := findRE "[^/]+.*?" .RelPermalink }} -{{ $product := index $productPathData 0 }} -{{ $currentVersion := index $productPathData 1 }} -
@@ -9,20 +5,7 @@ InfluxDB Docs
- {{ if or (eq $product nil) (eq $currentVersion nil) }} - {{ else }} -
-

{{ $currentVersion }}

-
    -
  • older
    • - {{ range (index .Site.Data.products $product).versions }} -
  • - {{ . }} -
    • - {{ end }} -
-
- {{ end }} + {{ partial "topnav/version-selector.html" . }}