From: Alexandros Date: Tue, 29 May 2018 22:48:36 +0000 (+0300) Subject: Add vimeo_simple X-Git-Tag: v0.42~25 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8de53244799f0d2d0343056d348d810343cf7aa5;p=brevno-suite%2Fhugo Add vimeo_simple Fixes #4749 --- diff --git a/config/privacy/privacyConfig.go b/config/privacy/privacyConfig.go index e7bb1e25..d4820396 100644 --- a/config/privacy/privacyConfig.go +++ b/config/privacy/privacyConfig.go @@ -82,6 +82,11 @@ type Twitter struct { // Vimeo holds the privacy configuration settingsrelated to the Vimeo shortcode. type Vimeo struct { Service `mapstructure:",squash"` + + // If simple mode is enabled, only a thumbnail is fetched from i.vimeocdn.com and + // shown with a play button overlaid. If a user clicks the button, he/she will + // be taken to the video page on vimeo.com in a new browser tab. + Simple bool } // YouTube holds the privacy configuration settingsrelated to the YouTube shortcode. diff --git a/config/privacy/privacyConfig_test.go b/config/privacy/privacyConfig_test.go index 72ffb546..5593872d 100644 --- a/config/privacy/privacyConfig_test.go +++ b/config/privacy/privacyConfig_test.go @@ -46,6 +46,7 @@ disable = true enableDNT = true [privacy.vimeo] disable = true +simple = true [privacy.youtube] disable = true privacyEnhanced = true @@ -69,7 +70,7 @@ simple = true assert.True(pc.Twitter.Disable) assert.True(pc.Twitter.EnableDNT) assert.True(pc.Vimeo.Disable) - + assert.True(pc.Vimeo.Simple) assert.True(pc.YouTube.PrivacyEnhanced) assert.True(pc.YouTube.Disable) } diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go index dfcca7b2..ece776c4 100644 --- a/tpl/tplimpl/embedded/templates.autogen.go +++ b/tpl/tplimpl/embedded/templates.autogen.go @@ -269,6 +269,41 @@ if (!doNotTrack) { {{ end }}`}, + {`shortcodes/__h_simple_assets.html`, `{{ define "__h_simple_css" }}{{/* These template definitions are global. */}} +{{- if not (.Page.Scratch.Get "__h_simple_css") -}} +{{/* Only include once */}} +{{- .Page.Scratch.Set "__h_simple_css" true -}} + +{{- end -}} +{{- end -}} +{{- define "__h_simple_icon_play" -}} + +{{- end -}} +`}, {`shortcodes/figure.html`, ` {{ if .Get "link"}}{{ end }} @@ -361,14 +396,37 @@ if (!doNotTrack) { {{- end -}}`}, {`shortcodes/vimeo.html`, `{{- $pc := .Page.Site.Config.Privacy.Vimeo -}} {{- if not $pc.Disable -}} -{{ if .IsNamedParams }}
- +{{- if $pc.Simple -}} +{{ template "_internal/shortcodes/vimeo_simple.html" . }} +{{- else -}} +{{ if .IsNamedParams }}
+
{{ else }} -
- +
+
{{ end }} +{{- end -}} {{- end -}}`}, + {`shortcodes/vimeo_simple.html`, `{{ $id := .Get "id" | default (.Get 0) }} +{{- $item := getJSON "https://vimeo.com/api/oembed.json?url=https://vimeo.com/" $id -}} +{{ $class := .Get "class" | default (.Get 1) }} +{{ $hasClass := $class }} +{{ $class := $class | default "__h_video" }} +{{ if not $hasClass }} +{{/* If class is set, assume the user wants to provide his own styles. */}} +{{ template "__h_simple_css" $ }} +{{ end }} +{{ $secondClass := "s_video_simple" }} +
+{{- with $item }} + +{{ $thumb := .thumbnail_url }} +{{ $original := $thumb | replaceRE "(_.*\\.)" "." }} +{{ .title }} +
{{ template "__h_simple_icon_play" $ }}
+{{- end -}} +`}, {`shortcodes/youtube.html`, `{{- $pc := .Page.Site.Config.Privacy.YouTube -}} {{- if not $pc.Disable -}} {{- $ytHost := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" -}} diff --git a/tpl/tplimpl/embedded/templates/shortcodes/__h_simple_assets.html b/tpl/tplimpl/embedded/templates/shortcodes/__h_simple_assets.html new file mode 100644 index 00000000..4ba88061 --- /dev/null +++ b/tpl/tplimpl/embedded/templates/shortcodes/__h_simple_assets.html @@ -0,0 +1,34 @@ +{{ define "__h_simple_css" }}{{/* These template definitions are global. */}} +{{- if not (.Page.Scratch.Get "__h_simple_css") -}} +{{/* Only include once */}} +{{- .Page.Scratch.Set "__h_simple_css" true -}} + +{{- end -}} +{{- end -}} +{{- define "__h_simple_icon_play" -}} + +{{- end -}} diff --git a/tpl/tplimpl/embedded/templates/shortcodes/vimeo.html b/tpl/tplimpl/embedded/templates/shortcodes/vimeo.html index 77dceed3..2929aa4a 100755 --- a/tpl/tplimpl/embedded/templates/shortcodes/vimeo.html +++ b/tpl/tplimpl/embedded/templates/shortcodes/vimeo.html @@ -1,10 +1,14 @@ {{- $pc := .Page.Site.Config.Privacy.Vimeo -}} {{- if not $pc.Disable -}} -{{ if .IsNamedParams }}
- +{{- if $pc.Simple -}} +{{ template "_internal/shortcodes/vimeo_simple.html" . }} +{{- else -}} +{{ if .IsNamedParams }}
+
{{ else }} -
- +
+
{{ end }} +{{- end -}} {{- end -}} \ No newline at end of file diff --git a/tpl/tplimpl/embedded/templates/shortcodes/vimeo_simple.html b/tpl/tplimpl/embedded/templates/shortcodes/vimeo_simple.html new file mode 100644 index 00000000..dac4aaa0 --- /dev/null +++ b/tpl/tplimpl/embedded/templates/shortcodes/vimeo_simple.html @@ -0,0 +1,18 @@ +{{ $id := .Get "id" | default (.Get 0) }} +{{- $item := getJSON "https://vimeo.com/api/oembed.json?url=https://vimeo.com/" $id -}} +{{ $class := .Get "class" | default (.Get 1) }} +{{ $hasClass := $class }} +{{ $class := $class | default "__h_video" }} +{{ if not $hasClass }} +{{/* If class is set, assume the user wants to provide his own styles. */}} +{{ template "__h_simple_css" $ }} +{{ end }} +{{ $secondClass := "s_video_simple" }} +
+{{- with $item }} + +{{ $thumb := .thumbnail_url }} +{{ $original := $thumb | replaceRE "(_.*\\.)" "." }} +{{ .title }} +
{{ template "__h_simple_icon_play" $ }}
+{{- end -}}