Navbar and Breadcrumbs URL fixv2.00

4 files changed, 17 insertions, 45 deletions

diff --git a/config.yaml b/config.yaml
index b5ccc03..8e0a2d5 100644
--- a/config.yaml
+++ b/config.yaml
@@ -3,7 +3,7 @@ languageCode: "en-us"
 title: "Hugo-profile"
 
 googleanalytics: UA-167646412-8
-disqusShortname: yourdisqusname
+disqusShortname: 
 Paginate: 3
 
 taxonomies:
diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml
index 347ace0..1a0ef29 100644
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@@ -4,7 +4,7 @@ title: "Hugo-profile"
 theme: "hugo-profile"

 

 googleanalytics: UA-xxxxxxx-x

-disqusShortname: yourdisqusname

+disqusShortname:

 Paginate: 3

 

 taxonomies:

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 96511f5..7a93b0e 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -181,23 +181,22 @@
         </div>
 
         <div>
-          {{ $siteUrl := replace .Permalink ( printf "%s" .Site.BaseURL) "" }}
-          {{ $.Scratch.Add "sitePath" .Site.BaseURL }}
-
-          {{ $.Scratch.Add "siteBreadcrumbs" (slice (dict "url" .Site.BaseURL "name" "home" "position" 1 )) }}
-          {{ range $index, $element := split $siteUrl "/" }}
-          {{ $.Scratch.Add "sitePath" $element }}
-          {{ $.Scratch.Add "sitePath" "/" }}
-          {{ if ne $element "" }}
-          {{ $.Scratch.Add "siteBreadcrumbs" (slice (dict "url" ($.Scratch.Get "sitePath") "name" . "position" (add $index 2))) }}
-          {{ end }}
-          {{ end }}
-
           <nav aria-label="breadcrumb">
             <ol class="breadcrumb">
-              {{ range $.Scratch.Get "siteBreadcrumbs" }}
-              <li class="breadcrumb-item" aria-current="page"><a href="{{ .url }}"> {{ .name }} </a></li>
+              <!-- Initialise a scratch variable "path" to an empty string -->
+              {{ $.Scratch.Set "path" "" }}
+              <li><a href="/">Home</a></li>
+              <!-- For each non-empty item in the URL path -->
+              {{ range $element := split .RelPermalink "/" }}
+              {{ if ne $element "" }}
+              <!-- Add the element to the scratch variable -->
+              {{ $.Scratch.Add "path" "/" }}{{ $.Scratch.Add "path" $element }}
+              <!-- Populate the href from the scratch variable -->
+              <span class="text-muted px-2">/</span>
+              <li><a href="{{ $.Scratch.Get "path" }}">{{ humanize . }}</a></li>
               {{ end }}
+              {{ end }}
+            </ol>
           </nav>
         </div>
         <!-- image -->
@@ -233,32 +232,5 @@
       </div>
     </div>
   </div>
-
-  {{ $url := replace .Permalink ( printf "%s" .Site.BaseURL) "" }}
-  {{ $.Scratch.Add "path" .Site.BaseURL }}
-
-  {{ $.Scratch.Add "breadcrumb" (slice (dict "url" .Site.BaseURL "name" "home" "position" 1 )) }}
-  {{ range $index, $element := split $url "/" }}
-  {{ $.Scratch.Add "path" $element }}
-  {{ $.Scratch.Add "path" "/" }}
-  {{ if ne $element "" }}
-  {{ $.Scratch.Add "breadcrumb" (slice (dict "url" ($.Scratch.Get "path") "name" . "position" (add $index 2))) }}
-  {{ end }}
-  {{ end }}
-
-  <script type="application/ld+json">
-  {
-    "@context": "http://schema.org",
-    "@type": "BreadcrumbList",
-    "itemListElement": [{{ range $.Scratch.Get "breadcrumb" }}{{ if ne .position 1 }},{{ end }}{
-          "@type": "ListItem",
-          "position": {{ .position }},
-          "item": {
-            "@id": "{{ .url }}",
-            "name": "{{ .name }}"
-          }
-      }{{ end }}]
-  }
-  </script>
 </section>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 6c64dd0..618de7e 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-white shadow-sm sticky-top">
 	<div class="container">
-		<a class="navbar-brand font-weight-bold" href="{{ .Site.BaseURL }}">
+		<a class="navbar-brand font-weight-bold" href="{{ .Site.BaseURL | relURL }}">
 			{{ if .Site.Params.favicon }}
 			<img src="{{ .Site.Params.favicon }}" width="30" height="30" class="d-inline-block align-top"
 				alt="{{ .Site.Title }}">
@@ -17,7 +17,7 @@
 		<div class="collapse navbar-collapse" id="navbarNavDropdown">
 			<ul class="navbar-nav ml-auto text-center">
 				<li class="nav-item navbar-text">
-					<a class="nav-link" href="{{ .Site.BaseURL }}#" aria-label="about">About</a>
+					<a class="nav-link" href="{{ .Site.BaseURL | relURL }}#" aria-label="about">About</a>
 				</li>
 
 				{{ range site.Params.customMenus }}