From fa9fe8b2f4055b89cd23bd9f0a8b50fb70918fe3 Mon Sep 17 00:00:00 2001 From: ChrisChinchilla Date: Tue, 15 Sep 2020 12:13:12 +0200 Subject: [PATCH] Squashed 'docs/themes/docs-theme/' changes from 4dba9dd2e..d84a9b2e3 d84a9b2e3 Change glossary path git-subtree-dir: docs/themes/docs-theme git-subtree-split: d84a9b2e3d94bc46382e79bb7b14775f5f9d29ff --- layouts/partials/docs/glossary-terms.html | 4 ++-- layouts/shortcodes/glossary_definition.html | 4 ++-- layouts/shortcodes/glossary_tooltip.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/layouts/partials/docs/glossary-terms.html b/layouts/partials/docs/glossary-terms.html index e6fd0fd3f1..efd91a40b9 100644 --- a/layouts/partials/docs/glossary-terms.html +++ b/layouts/partials/docs/glossary-terms.html @@ -1,4 +1,4 @@ -{{ $glossaryBundle := site.GetPage "page" "reference/glossary" }} +{{ $glossaryBundle := site.GetPage "page" "glossary" }} {{- if $glossaryBundle -}} {{ $pages := $glossaryBundle.Resources.ByType "page" }} {{- range site.Params.language_alternatives -}} @@ -9,5 +9,5 @@ {{ end }} {{- $.Scratch.Set "glossary_items" $pages -}} {{- else -}} -{{- errorf "[%s] Glossary Bundle not found for language. Create at least an index.md file inside docs/reference/glossary" site.Language.Lang -}} +{{- errorf "[%s] Glossary Bundle not found for language. Create at least an index.md file inside docs/glossary" site.Language.Lang -}} {{- end -}} \ No newline at end of file diff --git a/layouts/shortcodes/glossary_definition.html b/layouts/shortcodes/glossary_definition.html index b53b26a089..24a6b1b7c2 100644 --- a/layouts/shortcodes/glossary_definition.html +++ b/layouts/shortcodes/glossary_definition.html @@ -1,11 +1,11 @@ {{- $id := .Get "term_id" -}} {{- $length := .Get "length" -}} {{- $prepend := .Get "prepend" }} -{{- $glossaryBundle := site.GetPage "page" "reference/glossary" -}} +{{- $glossaryBundle := site.GetPage "page" "glossary" -}} {{- $glossaryItems := $glossaryBundle.Resources.ByType "page" -}} {{- $term_info := $glossaryItems.GetMatch (printf "%s.md" $id ) -}} {{- if not $term_info -}} -{{- errorf "[%s] %q: %q is not a valid glossary term_id, see ./reference/glossary/* for a full list" site.Language.Lang .Page.Path $id -}} +{{- errorf "[%s] %q: %q is not a valid glossary term_id, see ./glossary/* for a full list" site.Language.Lang .Page.Path $id -}} {{- end -}} {{- with $term_info -}} {{- if (strings.Contains "short" $length) -}} diff --git a/layouts/shortcodes/glossary_tooltip.html b/layouts/shortcodes/glossary_tooltip.html index 14747e0e46..cefbebcac3 100644 --- a/layouts/shortcodes/glossary_tooltip.html +++ b/layouts/shortcodes/glossary_tooltip.html @@ -7,7 +7,7 @@ {{- else -}} {{- $term_info := $glossary_items.GetMatch (printf "%s.md" $id ) -}} {{- if not $term_info -}} -{{- errorf "[%s] %q: %q is not a valid glossary term_id, see ./reference/glossary/* for a full list" site.Language.Lang .Page.Path $id -}} +{{- errorf "[%s] %q: %q is not a valid glossary term_id, see ./glossary/* for a full list" site.Language.Lang .Page.Path $id -}} {{- end }} {{- with $term_info -}} {{- $text := $text | default $term_info.Title -}}