Move subnav to partial, take first pass at conditionalizing breadcrumb links

4 files changed, 29 insertions, 32 deletions

diff --git a/site/layouts/_default/docs.html b/site/layouts/_default/docs.html
index 9bde5246a..57dde4089 100644
--- a/site/layouts/_default/docs.html
+++ b/site/layouts/_default/docs.html
@@ -7,24 +7,9 @@
     {{ partial "skippy" . }}
 
     {{ partial "docs-navbar" . }}
+    {{ partial "docs-subnav" . }}
 
-    <nav class="bd-subnavbar pt-2 pb-3 pb-md-2 mb-4">
-      <div class="container d-flex align-items-md-center flex-column flex-md-row">
-        <div class="d-flex align-items-center mb-2 mb-md-0 mr-md-auto">
-          <a class="link-dark" href="/" onclick="ga('send', 'event', 'Subnav', 'click', 'Bootstrap');">Bootstrap</a>
-          {{ partial "icons/booticon-chevron-right.svg" (dict "class" "booticon d-inline-block mx-2 flex-shrink-0" "width" "12px" "height" "12px") }}
-          <a class="link-dark" href="/docs/{{ .Site.Params.docs_version }}/getting-started/introduction/" onclick="ga('send', 'event', 'Subnav', 'click', 'Documentation');">Documentation</a>
-          {{ partial "icons/booticon-chevron-right.svg" (dict "class" "booticon d-inline-block mx-2 flex-shrink-0" "width" "12px" "height" "12px") }}
-
-          {{ partial "docs-versions" . }}
-        </div>
-        <form class="bd-search d-flex align-items-center">
-          <input type="search" class="form-control" id="search-input" placeholder="Search..." aria-label="Search for..." autocomplete="off" data-docs-version="{{ .Site.Params.docs_version }}">
-        </form>
-      </div>
-    </nav>
-
-    <div class="container">
+    <div class="container my-4">
       <div class="row flex-xl-nowrap">
         <div class="col-md-3 bd-sidebar">
           {{ partial "docs-sidebar" . }}
diff --git a/site/layouts/_default/home.html b/site/layouts/_default/home.html
index c03de11ab..c2b531b49 100644
--- a/site/layouts/_default/home.html
+++ b/site/layouts/_default/home.html
@@ -7,6 +7,7 @@
     {{ partial "skippy" . }}
 
     {{ partial "docs-navbar" . }}
+    {{ partial "docs-subnav" . }}
 
     {{ partial "home/masthead" . }}
     {{ partial "home/masthead-followup" . }}
diff --git a/site/layouts/_default/single.html b/site/layouts/_default/single.html
index b8caae6dd..dbd9c01fb 100644
--- a/site/layouts/_default/single.html
+++ b/site/layouts/_default/single.html
@@ -7,21 +7,7 @@
     {{ partial "skippy" . }}
 
     {{ partial "docs-navbar" . }}
-
-    <nav class="bd-subnavbar pt-2 pb-3 pb-md-2 mb-4">
-      <div class="container d-flex align-items-md-center flex-column flex-md-row">
-        <div class="d-flex align-items-center mb-2 mb-md-0 mr-md-auto">
-          <a class="link-dark" href="/" onclick="ga('send', 'event', 'Subnav', 'click', 'Bootstrap');">Bootstrap</a>
-          {{ partial "icons/booticon-chevron-right.svg" (dict "class" "booticon d-inline-block mx-2 flex-shrink-0" "width" "12px" "height" "12px") }}
-          <a class="link-dark" href="/docs/{{ .Site.Params.docs_version }}/getting-started/introduction/" onclick="ga('send', 'event', 'Subnav', 'click', 'Documentation');">Documentation</a>
-          {{ partial "icons/booticon-chevron-right.svg" (dict "class" "booticon d-inline-block mx-2 flex-shrink-0" "width" "12px" "height" "12px") }}
-          {{ partial "docs-versions" . }}
-          {{ partial "icons/booticon-chevron-right.svg" (dict "class" "booticon d-inline-block mx-2 flex-shrink-0" "width" "12px" "height" "12px") }}
-          <span class="text-muted">Examples</span>
-        </div>
-        {{ partial "docs-search" . }}
-      </div>
-    </nav>
+    {{ partial "docs-subnav" . }}
 
     <header class="py-5 border-bottom">
       <div class="container pt-md-1 pb-md-4">
diff --git a/site/layouts/partials/docs-subnav.html b/site/layouts/partials/docs-subnav.html
new file mode 100644
index 000000000..2afeeddfd
--- /dev/null
+++ b/site/layouts/partials/docs-subnav.html
@@ -0,0 +1,25 @@
+<nav class="bd-subnavbar pt-2 pb-3 pb-md-2">
+  <div class="container d-flex align-items-md-center flex-column flex-md-row">
+    <div class="d-flex align-items-center mb-2 mb-md-0 mr-md-auto">
+      <a class="link-dark" href="/" onclick="ga('send', 'event', 'Subnav', 'click', 'Bootstrap');">Bootstrap</a>
+      {{ partial "icons/booticon-chevron-right.svg" (dict "class" "booticon d-inline-block mx-2 flex-shrink-0" "width" "12px" "height" "12px") }}
+
+      {{ if (eq .Page.Layout "docs") or (eq .Page.Layout "single") }}
+        <a class="link-dark" href="/docs/{{ .Site.Params.docs_version }}/getting-started/introduction/" onclick="ga('send', 'event', 'Subnav', 'click', 'Documentation');">Documentation</a>
+        {{ partial "icons/booticon-chevron-right.svg" (dict "class" "booticon d-inline-block mx-2 flex-shrink-0" "width" "12px" "height" "12px") }}
+      {{ end }}
+
+      {{ partial "docs-versions" . }}
+
+      {{ if eq .Page.Title "Examples" }}
+        {{ partial "icons/booticon-chevron-right.svg" (dict "class" "booticon d-inline-block mx-2 flex-shrink-0" "width" "12px" "height" "12px") }}
+        <span class="text-muted">Examples</span>
+      {{ end }}
+
+
+    </div>
+    <form class="bd-search d-flex align-items-center">
+      <input type="search" class="form-control" id="search-input" placeholder="Search..." aria-label="Search for..." autocomplete="off" data-docs-version="{{ .Site.Params.docs_version }}">
+    </form>
+  </div>
+</nav>