Improve handling of templates, fix issue with Hugo 0.5.0
Removes wrapping the template maps in an extra slice
This commit is contained in:
parent
778a6153a9
commit
cc282afdb7
1 changed files with 10 additions and 3 deletions
|
@ -16,12 +16,19 @@
|
||||||
{{- $noOutput := slice "content" "template" -}}
|
{{- $noOutput := slice "content" "template" -}}
|
||||||
{{- $template := $params.Get "template" -}}
|
{{- $template := $params.Get "template" -}}
|
||||||
{{- if $template -}}
|
{{- if $template -}}
|
||||||
{{- $scratch.Add "templateParams" (slice $.Site.Params.reveal_hugo.templates) -}}
|
{{- $scratch.Add "templateParams" slice -}}
|
||||||
|
{{- with $.Site.Params.reveal_hugo.templates -}}
|
||||||
|
{{- $scratch.Add "templateParams" . -}}
|
||||||
|
{{- end -}}
|
||||||
{{- if ne $.Page.File.LogicalName "_index.md" -}}
|
{{- if ne $.Page.File.LogicalName "_index.md" -}}
|
||||||
{{- $scratch.Add "templateParams" (slice ($.Site.GetPage $.Page.Section).Params.reveal_hugo.templates) -}}
|
{{- $scratch.Add "templateParams" ($.Site.GetPage $.Page.Section).Params.reveal_hugo.templates -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- with $.Page.Params.reveal_hugo.templates -}}
|
||||||
|
{{- $scratch.Add "templateParams" . -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- $scratch.Add "templateParams" (slice $.Page.Params.reveal_hugo.templates) -}}
|
{{- $scratch.Add "templateParams" (slice $.Page.Params.reveal_hugo.templates) -}}
|
||||||
{{- range ($scratch.Get "templateParams") -}}
|
{{- $templateParams := $scratch.Get "templateParams" }}
|
||||||
|
{{- range $templateParams -}}
|
||||||
{{- if (ne . nil) -}}
|
{{- if (ne . nil) -}}
|
||||||
{{- range $key, $value := (index . $template) -}}
|
{{- range $key, $value := (index . $template) -}}
|
||||||
{{- $scratch.SetInMap "template" $key $value | safeHTMLAttr -}}
|
{{- $scratch.SetInMap "template" $key $value | safeHTMLAttr -}}
|
||||||
|
|
Loading…
Reference in a new issue