From ce857e005246025a90ec4ddd933cee7cfab4488a Mon Sep 17 00:00:00 2001 From: ChrisChinchilla Date: Tue, 15 Sep 2020 12:28:23 +0200 Subject: [PATCH] Squashed 'docs/themes/docs-theme/' changes from 7ac79e398..06ca4188b 06ca4188b Change glossary path REVERT: 7ac79e398 Change glossary path git-subtree-dir: docs/themes/docs-theme git-subtree-split: 06ca4188b1b040ce0f6334c50aeaecf8352c789f --- layouts/glossary.html | 2 +- layouts/partials/docs/glossary-terms.html | 4 ++-- layouts/shortcodes/glossary_tooltip.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/glossary.html b/layouts/glossary.html index b56272fa77..48ffa6e099 100644 --- a/layouts/glossary.html +++ b/layouts/glossary.html @@ -26,7 +26,7 @@

{{ .Title }}

{{ T "layouts_docs_glossary_deselect_all" }}

{{ T "layouts_docs_glossary_click_details_before" }} [+] {{ T "layouts_docs_glossary_click_details_after" }}

-{{ partial "docs/glossary-terms.html" . }} +{{ partial "glossary-terms.html" . }} {{ $glossary_items := $.Scratch.Get "glossary_items" }} {{ with $glossary_items }} {{ $glossary_terms := sort . "Title" "asc" }} diff --git a/layouts/partials/docs/glossary-terms.html b/layouts/partials/docs/glossary-terms.html index cb2eabf004..61fc924fe5 100644 --- a/layouts/partials/docs/glossary-terms.html +++ b/layouts/partials/docs/glossary-terms.html @@ -1,4 +1,4 @@ -{{ $glossaryBundle := site.GetPage "page" "docs/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/glossary" site.Language.Lang -}} +{{- errorf "[%s] Glossary Bundle not found for language. Create at least an index.md file inside glossary" site.Language.Lang -}} {{- end -}} \ No newline at end of file diff --git a/layouts/shortcodes/glossary_tooltip.html b/layouts/shortcodes/glossary_tooltip.html index 3fa76d1e30..2b874dcc54 100644 --- a/layouts/shortcodes/glossary_tooltip.html +++ b/layouts/shortcodes/glossary_tooltip.html @@ -1,6 +1,6 @@ {{- $id := .Get "term_id" -}} {{- $text := .Get "text" -}} -{{- partial "docs/glossary-terms.html" $.Page -}} +{{- partial "glossary-terms.html" $.Page -}} {{- $glossary_items := $.Page.Scratch.Get "glossary_items" -}} {{- if not $glossary_items -}} {{- errorf "[%s] No glossary items found" site.Language.Lang -}}