Merge pull request #608 from narrenfrei/update-taxonomy

Fix incorrect use of isset - WIP
google · Jun 23, 2021 · c36be07 · c36be07
2 parents 0f9c38b + 9759ccd
commit c36be07
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/layouts/_default/content.html b/layouts/_default/content.html
@@ -3,7 +3,7 @@ <h1>{{ .Title }}</h1>
 	{{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
 	<header class="article-meta">
 		{{ $context := . }}
-		{{ if isset .Site.Params.Taxonomy "taxonomypageheader" }}
+		{{ if .Site.Params.Taxonomy.taxonomyPageHeader }}
 			{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }}
 				{{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }}
 			{{ end }}

diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
@@ -13,7 +13,7 @@ <h3><a href="{{ $manualLink }}"{{ with .Params.manualLinkTitle }} title="{{ . }}
           <p>{{ .Description | markdownify }}</p>
           <header class="article-meta">
             {{ $context := . }}
-            {{ if isset .Site.Params.Taxonomy "taxonomypageheader" }}
+            {{ if .Site.Params.Taxonomy.taxonomyPageHeader }}
               {{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }}
                 {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }}
               {{ end }}

diff --git a/layouts/blog/content.html b/layouts/blog/content.html
@@ -7,7 +7,7 @@ <h1>{{ .Title }}</h1>
 	</div>
 	<header class="article-meta">
 		{{ $context := . }}
-		{{ if isset .Site.Params.Taxonomy "taxonomypageheader" }}
+		{{ if .Site.Params.Taxonomy.taxonomyPageHeader }}
 			{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }}
 				{{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }}
 			{{ end }}

diff --git a/layouts/blog/list.html b/layouts/blog/list.html
@@ -19,7 +19,7 @@ <h5 class="mt-0 mb-1"><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h5>
 						<p class="mb-2 mb-md-3"><small class="text-muted">{{ .Date.Format ($.Param "time_format_blog") }} {{ T "ui_in"}} {{ .CurrentSection.LinkTitle }}</small></p>
 						<header class="article-meta">
 							{{ $context := . }}
-							{{ if isset .Site.Params.Taxonomy "taxonomypageheader" }}
+							{{ if .Site.Params.Taxonomy.taxonomyPageHeader }}
 								{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }}
 									{{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }}
 								{{ end }}

diff --git a/layouts/docs/list.html b/layouts/docs/list.html
@@ -4,7 +4,7 @@ <h1>{{ .Title }}</h1>
   {{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
 	<header class="article-meta">
 		{{ $context := . }}
-		{{ if isset .Site.Params.Taxonomy "taxonomypageheader" }}
+		{{ if .Site.Params.Taxonomy.taxonomyPageHeader }}
 			{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }}
 				{{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }}
 			{{ end }}

diff --git a/layouts/partials/taxonomy_terms_clouds.html b/layouts/partials/taxonomy_terms_clouds.html
@@ -1,5 +1,5 @@
 {{ $context := . }}
-{{ if isset .Site.Params.Taxonomy "taxonomycloud" }}
+{{ if .Site.Params.Taxonomy.taxonomyCloud }}
 	{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyCloud }}
 		{{ if isset $.Site.Params.Taxonomy "taxonomycloudtitle" }}
 			{{ $.Scratch.Set "title" ( index $.Site.Params.Taxonomy.taxonomyCloudTitle $index ) }}

diff --git a/layouts/swagger/list.html b/layouts/swagger/list.html
@@ -4,7 +4,7 @@ <h1>{{ .Title }}</h1>
 	{{ with .Params.description }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
 	<header class="article-meta">
 		{{ $context := . }}
-		{{ if isset .Site.Params.Taxonomy "taxonomypageheader" }}
+		{{ if .Site.Params.Taxonomy.taxonomyPageHeader }}
 			{{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }}
 				{{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }}
 			{{ end }}

diff --git a/userguide/config.toml b/userguide/config.toml
@@ -231,7 +231,7 @@ enable = true
 [params.print]
 disable_toc = false
 
-[params.taxonomy]
+# [params.taxonomy]
 # taxonomyCloud = ["tags", "categories"] # set taxonomyCloud = [] to hide taxonomy clouds
 # taxonomyCloudTitle = ["Tag Cloud", "Cloud of Categories"] # if used, must have same lang as taxonomyCloud
 # taxonomyPageHeader = ["tags", "categories"] # set taxonomyPageHeader = [] to hide taxonomies on the page headers