From 0ee3f033d96a0af227c42edb71274a5e081a6e04 Mon Sep 17 00:00:00 2001 From: ChrisChinchilla Date: Tue, 15 Sep 2020 12:23:18 +0200 Subject: [PATCH] Squashed 'docs/themes/docs-theme/' changes from d84a9b2e3..7ac79e398 7ac79e398 Change glossary path REVERT: d84a9b2e3 Change glossary path git-subtree-dir: docs/themes/docs-theme git-subtree-split: 7ac79e398305a2dbdbd88b3cd36e3b4c31e7483a --- layouts/partials/docs/glossary-terms.html | 2 +- layouts/shortcodes/glossary_tooltip.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/partials/docs/glossary-terms.html b/layouts/partials/docs/glossary-terms.html index efd91a40b9..cb2eabf004 100644 --- a/layouts/partials/docs/glossary-terms.html +++ b/layouts/partials/docs/glossary-terms.html @@ -1,4 +1,4 @@ -{{ $glossaryBundle := site.GetPage "page" "glossary" }} +{{ $glossaryBundle := site.GetPage "page" "docs/glossary" }} {{- if $glossaryBundle -}} {{ $pages := $glossaryBundle.Resources.ByType "page" }} {{- range site.Params.language_alternatives -}} diff --git a/layouts/shortcodes/glossary_tooltip.html b/layouts/shortcodes/glossary_tooltip.html index cefbebcac3..3fa76d1e30 100644 --- a/layouts/shortcodes/glossary_tooltip.html +++ b/layouts/shortcodes/glossary_tooltip.html @@ -11,7 +11,7 @@ {{- end }} {{- with $term_info -}} {{- $text := $text | default $term_info.Title -}} -{{- $glossary_home := "reference/glossary/?all=true" | relLangURL -}} +{{- $glossary_home := "glossary/?all=true" | relLangURL -}} {{- $external_link := $term_info.Params.full_link | default (printf "%s#term-%s" $glossary_home $id | safeURL ) -}} {{- $tooltip := $term_info.Params.short_description | markdownify -}} {{- $tooltip := $tooltip | replaceRE "(?s)(.*?).*" "$1" | plainify -}}