From eb17b172ed52870d81457f0a8de2f5dcfdd3d8f5 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 6 Feb 2022 23:57:32 +0100 Subject: [PATCH] fix: use absolute ULRs in img shortcode (#196) --- layouts/_default/single.html | 2 +- layouts/partials/content.html | 4 ---- layouts/partials/utils/content.html | 6 ++++++ layouts/shortcodes/img.html | 10 +++++----- 4 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 layouts/partials/content.html create mode 100644 layouts/partials/utils/content.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 5425701..84d0be3 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -28,7 +28,7 @@ {{ end }}
- {{ partial "content" . }} + {{ partial "utils/content" . }}
{{ end }} diff --git a/layouts/partials/content.html b/layouts/partials/content.html deleted file mode 100644 index 0aff871..0000000 --- a/layouts/partials/content.html +++ /dev/null @@ -1,4 +0,0 @@ -{{- $content := .Content -}} -{{- $content = $content | replaceRE `` `` | safeHTML -}} -{{- $content = $content | replaceRE `((?:.|\n)+?
)` `
${1}
` | safeHTML -}} -{{- $content -}} diff --git a/layouts/partials/utils/content.html b/layouts/partials/utils/content.html new file mode 100644 index 0000000..784632f --- /dev/null +++ b/layouts/partials/utils/content.html @@ -0,0 +1,6 @@ +{{ $html := .Content }} + +{{ $html = $html | replaceRE `` `` | safeHTML }} +{{ $html = $html | replaceRE `((?:.|\n)+?
)` `
${1}
` | safeHTML }} + +{{ return $html }} diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html index a316317..42db633 100644 --- a/layouts/shortcodes/img.html +++ b/layouts/shortcodes/img.html @@ -6,17 +6,17 @@ {{ with $source }} {{ $caption := default .Title $customAlt }} - {{ $tiny := (.Resize "320x").RelPermalink }} - {{ $small := (.Resize "600x").RelPermalink }} - {{ $medium := (.Resize "1200x").RelPermalink }} - {{ $large := (.Resize "1800x").RelPermalink }} + {{ $tiny := (.Resize "320x").Permalink }} + {{ $small := (.Resize "600x").Permalink }} + {{ $medium := (.Resize "1200x").Permalink }} + {{ $large := (.Resize "1800x").Permalink }} {{ $size := dict "tiny" $tiny "small" $small "medium" $medium "large" $large }}
- +