From 448081b840db4a23c0c49c2d869ac207dcb6ac40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 25 May 2018 11:16:23 +0200 Subject: Remove youtube_simple for now We need to revisit and complete that. See #4751 --- tpl/tplimpl/embedded/templates.autogen.go | 21 ++------------------- .../embedded/templates/shortcodes/youtube.html | 6 +----- .../templates/shortcodes/youtube_simple.html | 14 -------------- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 tpl/tplimpl/embedded/templates/shortcodes/youtube_simple.html (limited to 'tpl') diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go index 9637deb10..43e1b4d15 100644 --- a/tpl/tplimpl/embedded/templates.autogen.go +++ b/tpl/tplimpl/embedded/templates.autogen.go @@ -384,30 +384,13 @@ M66.52,7.74c-0.78-2.93-2.49-5.41-5.42-6.19C55.79,.13,34,0,34,0S12.21,.13,6.9,1.5 {`shortcodes/youtube.html`, `{{- $pc := .Page.Site.Config.Privacy.YouTube -}} {{- if not $pc.Disable -}} {{- $ytHost := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" -}} -{{- if $pc.Simple -}} -{{ template "_internal/shortcodes/youtube_simple.html" . }} -{{- else -}} {{- $id := .Get "id" | default (.Get 0) -}} {{- $class := .Get "class" | default (.Get 1) }}
-{{ end }} -{{- end -}}`}, - {`shortcodes/youtube_simple.html`, `{{ $id := .Get "id" | default (.Get 0) }} -{{ $class := .Get "class" | default (.Get 1) }} -{{ $hasClass := $class }} -{{ $class := $class | default "__h_youtube" }} -{{ if not $hasClass }} -{{/* If class is set, assume the user wants to provide his own styles. */}} -{{ template "__h_simple_css" $ }} -{{ end }} -{{ $secondClass := "s_youtube_simple" }} -
-{{ $tb := printf "//i.ytimg.com/vi/%s/" $id }} - - Video -
`}, +{{ end -}} +`}, {`twitter_cards.html`, `{{- with $.Params.images -}} diff --git a/tpl/tplimpl/embedded/templates/shortcodes/youtube.html b/tpl/tplimpl/embedded/templates/shortcodes/youtube.html index bbb3fdd07..9ba38fa8c 100755 --- a/tpl/tplimpl/embedded/templates/shortcodes/youtube.html +++ b/tpl/tplimpl/embedded/templates/shortcodes/youtube.html @@ -1,13 +1,9 @@ {{- $pc := .Page.Site.Config.Privacy.YouTube -}} {{- if not $pc.Disable -}} {{- $ytHost := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" -}} -{{- if $pc.Simple -}} -{{ template "_internal/shortcodes/youtube_simple.html" . }} -{{- else -}} {{- $id := .Get "id" | default (.Get 0) -}} {{- $class := .Get "class" | default (.Get 1) }}
-{{ end }} -{{- end -}} \ No newline at end of file +{{ end -}} diff --git a/tpl/tplimpl/embedded/templates/shortcodes/youtube_simple.html b/tpl/tplimpl/embedded/templates/shortcodes/youtube_simple.html deleted file mode 100644 index 641bd124b..000000000 --- a/tpl/tplimpl/embedded/templates/shortcodes/youtube_simple.html +++ /dev/null @@ -1,14 +0,0 @@ -{{ $id := .Get "id" | default (.Get 0) }} -{{ $class := .Get "class" | default (.Get 1) }} -{{ $hasClass := $class }} -{{ $class := $class | default "__h_youtube" }} -{{ if not $hasClass }} -{{/* If class is set, assume the user wants to provide his own styles. */}} -{{ template "__h_simple_css" $ }} -{{ end }} -{{ $secondClass := "s_youtube_simple" }} -
-{{ $tb := printf "//i.ytimg.com/vi/%s/" $id }} - - Video -
\ No newline at end of file -- cgit v1.2.3