Skip to content

Commit

Permalink
Squashed 'docs/themes/docs-theme/' changes from 7ac79e398..06ca4188b
Browse files Browse the repository at this point in the history
06ca4188b Change glossary path
REVERT: 7ac79e398 Change glossary path

git-subtree-dir: docs/themes/docs-theme
git-subtree-split: 06ca4188b1b040ce0f6334c50aeaecf8352c789f
  • Loading branch information
ChrisChinchilla committed Sep 15, 2020
1 parent 0ee3f03 commit ce857e0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion layouts/glossary.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1>{{ .Title }}</h1>
<span class="tag-option"><a id="deselect-all-tags" href="javascript:void(0)">{{ T "layouts_docs_glossary_deselect_all" }}</a></span>
</div>
<p>{{ T "layouts_docs_glossary_click_details_before" }} <a href="javascript:void(0)" class="no-underline">[+]</a> {{ T "layouts_docs_glossary_click_details_after" }}</p>
{{ partial "docs/glossary-terms.html" . }}
{{ partial "glossary-terms.html" . }}
{{ $glossary_items := $.Scratch.Get "glossary_items" }}
{{ with $glossary_items }}
{{ $glossary_terms := sort . "Title" "asc" }}
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/docs/glossary-terms.html
Original file line number Diff line number Diff line change
@@ -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 -}}
Expand All @@ -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 -}}
2 changes: 1 addition & 1 deletion layouts/shortcodes/glossary_tooltip.html
Original file line number Diff line number Diff line change
@@ -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 -}}
Expand Down

0 comments on commit ce857e0

Please sign in to comment.