Merge pull request #87 from google/LisaFC-patch-2

ensure shortcodes work with old-Hugo and nu-Hugo
google · Jun 17, 2019 · 44d75fc · 44d75fc
2 parents 44bb4f4 + c0ff0c8
commit 44d75fc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/layouts/shortcodes/alert.html b/layouts/shortcodes/alert.html
@@ -1,5 +1,6 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 {{ $color := .Get "color" | default "primary" }}
 <div class="alert alert-{{ $color }}" role="alert">
 {{ with .Get "title" }}<h4 class="alert-heading">{{ . | safeHTML }}</h4>{{ end }}
-{{ .Inner }}
-</div>
+{{ .Inner | markdownify }}
+</div>
diff --git a/layouts/shortcodes/blocks/cover.html b/layouts/shortcodes/blocks/cover.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 {{ $blockID := printf "td-cover-block-%d" .Ordinal }}
 {{ $promo_image := (.Page.Resources.ByType "image").GetMatch "**background*" }}
 {{ $logo_image := (.Page.Resources.ByType "image").GetMatch "**logo*" }}

diff --git a/layouts/shortcodes/blocks/lead.html b/layouts/shortcodes/blocks/lead.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 {{ $col_id := .Get "color" | default .Ordinal }}
 {{ $height := .Get "height" | default "auto"  }}
 {{/* Height can be one of: auto, min, med, max, full. */}}

diff --git a/layouts/shortcodes/blocks/section.html b/layouts/shortcodes/blocks/section.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 {{ $col_id := .Get "color" | default .Ordinal }}
 {{ $height := .Get "height" | default "auto"  }}
 {{ $type   := .Get "type" | default "" }} 

diff --git a/layouts/shortcodes/pageinfo.html b/layouts/shortcodes/pageinfo.html
@@ -1,3 +1,4 @@
+{{ $_hugo_config := `{ "version": 1 }` }}
 {{ $color := .Get "color" | default "primary" }}
 <div class="pageinfo pageinfo-{{ $color }}">
 {{ .Inner }}