From 1f60136bf31cd5814321443827ab6f88ac9d4e0e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 13 Apr 2016 11:47:10 +0100 Subject: [PATCH] Updated other extensions --- source/_talks/2012-09-05-what-is-this-drupal-thing.md | 2 +- source/_talks/2014-03-01-git-flow.md | 10 +++++----- source/_talks/2014-07-02-drush-make-drupalbristol.md | 2 +- source/_talks/2015-04-08-drupal-8.md | 4 ++-- .../_talks/2015-07-25-test-drive-twig-with-sculpin.md | 4 ++-- source/_talks/2015-08-25-dancing-for-drupal.md | 4 ++-- source/_talks/2015-10-14-sculpin.md | 4 ++-- ...getting-started-with-drupal-8-module-development.md | 8 ++++---- src/AppBundle/Twig/SpeakerDeckExtension.php | 5 +++-- src/AppBundle/Twig/TweetExtension.php | 4 +++- src/AppBundle/Twig/VimeoExtension.php | 4 +++- 11 files changed, 28 insertions(+), 23 deletions(-) diff --git a/source/_talks/2012-09-05-what-is-this-drupal-thing.md b/source/_talks/2012-09-05-what-is-this-drupal-thing.md index f32f5b97..8c053b71 100644 --- a/source/_talks/2012-09-05-what-is-this-drupal-thing.md +++ b/source/_talks/2012-09-05-what-is-this-drupal-thing.md @@ -14,5 +14,5 @@ tags: - unified-diff --- {% block video %} -{{ vimeo('49827006')|raw }} +{{ vimeo('49827006') }} {% endblock %} diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md index 86d8dd1c..6ace4a0d 100644 --- a/source/_talks/2014-03-01-git-flow.md +++ b/source/_talks/2014-03-01-git-flow.md @@ -18,7 +18,7 @@ slug: git-flow tweets: yes --- {% block slides %} -{{ speakerdeck('201559e0f103013198dd5a5f6f23ab67', '1.29456384323641')|raw }} +{{ speakerdeck('201559e0f103013198dd5a5f6f23ab67', '1.29456384323641') }} {% endblock %} {% block video %} @@ -26,8 +26,8 @@ tweets: yes {% endblock %} {% block feedback %} -{{ tweet('Great talk on git flow @opdavies #dclondon

— CURVE (@CurveAgency) March 2, 2014')|raw }} -{{ tweet('Great presentation by @opdavies on git flow at #dclondon very well prepared and presented. pic.twitter.com/tDINp2Nsbn

— Greg Franklin (@gfranklin) March 2, 2014')|raw }} -{{ tweet('@opdavies Thanks for the talk today on git flow. Looking forward to use it. #drupalcampldn #dclondon #git

— Drupal Cafe UK (@drupal_cafe) March 2, 2014')|raw }} -{{ tweet('@opdavies @DrupalCampLDN always had trouble with git. Your talk + Git flow has made it all very easy.

— James Tombs (@jtombs) March 2, 2014')|raw }} +{{ tweet('Great talk on git flow @opdavies #dclondon

— CURVE (@CurveAgency) March 2, 2014') }} +{{ tweet('Great presentation by @opdavies on git flow at #dclondon very well prepared and presented. pic.twitter.com/tDINp2Nsbn

— Greg Franklin (@gfranklin) March 2, 2014') }} +{{ tweet('@opdavies Thanks for the talk today on git flow. Looking forward to use it. #drupalcampldn #dclondon #git

— Drupal Cafe UK (@drupal_cafe) March 2, 2014') }} +{{ tweet('@opdavies @DrupalCampLDN always had trouble with git. Your talk + Git flow has made it all very easy.

— James Tombs (@jtombs) March 2, 2014') }} {% endblock %} diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md index 5725b2dc..9a7565c2 100644 --- a/source/_talks/2014-07-02-drush-make-drupalbristol.md +++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md @@ -15,5 +15,5 @@ tags: - drush-make --- {% block slides %} -{{ speakerdeck('42605700f102013198de5a5f6f23ab67', '1.29456384323641')|raw }} +{{ speakerdeck('42605700f102013198de5a5f6f23ab67', '1.29456384323641') }} {% endblock %} diff --git a/source/_talks/2015-04-08-drupal-8.md b/source/_talks/2015-04-08-drupal-8.md index faf08113..da95ab23 100644 --- a/source/_talks/2015-04-08-drupal-8.md +++ b/source/_talks/2015-04-08-drupal-8.md @@ -23,7 +23,7 @@ I categorised the technical changes into groups for site builders, developers an {% endblock %} {% block slides %} -{{ speakerdeck('46ba4ba577d94a32b7abdade610ceb69', '1.29456384323641')|raw }} +{{ speakerdeck('46ba4ba577d94a32b7abdade610ceb69', '1.29456384323641') }} {% endblock %} {% block video %} @@ -31,5 +31,5 @@ I categorised the technical changes into groups for site builders, developers an {% endblock %} {% block feedback %} -{{ tweet('Cool to hear how much new stuff is in @drupal 8. Integrating with more third party code rather than rolling their own. #phpsw

— Tom Robertshaw (@bobbyshaw) April 8, 2015')|raw }} +{{ tweet('Cool to hear how much new stuff is in @drupal 8. Integrating with more third party code rather than rolling their own. #phpsw

— Tom Robertshaw (@bobbyshaw) April 8, 2015') }} {% endblock %} diff --git a/source/_talks/2015-07-25-test-drive-twig-with-sculpin.md b/source/_talks/2015-07-25-test-drive-twig-with-sculpin.md index ea6098ee..2882c2fa 100644 --- a/source/_talks/2015-07-25-test-drive-twig-with-sculpin.md +++ b/source/_talks/2015-07-25-test-drive-twig-with-sculpin.md @@ -23,9 +23,9 @@ This session covered how to install Sculpin itself, as well as how to use it to {% endblock %} {% block slides %} -{{ speakerdeck('54589d2e50a3476a9a75aed809e9edf1', '1.77777777777778')|raw }} +{{ speakerdeck('54589d2e50a3476a9a75aed809e9edf1', '1.77777777777778') }} {% endblock %} {% block feedback %} -{{ tweet('Twig said 'foo', then Sculpin said 'bar'. They agreed to go spaceless ;-) Interesting talk by @opdavies #dcnorth15 http://t.co/26GmhiCdfJ

— Stefan van Hooft (@hooftio) July 25, 2015')|raw }} +{{ tweet('Twig said 'foo', then Sculpin said 'bar'. They agreed to go spaceless ;-) Interesting talk by @opdavies #dcnorth15 http://t.co/26GmhiCdfJ

— Stefan van Hooft (@hooftio) July 25, 2015') }} {% endblock %} diff --git a/source/_talks/2015-08-25-dancing-for-drupal.md b/source/_talks/2015-08-25-dancing-for-drupal.md index 7b6ebdca..d6c5356a 100644 --- a/source/_talks/2015-08-25-dancing-for-drupal.md +++ b/source/_talks/2015-08-25-dancing-for-drupal.md @@ -30,9 +30,9 @@ In each point, tried to cover the differences between Drupal core and developing {% endblock %} {% block slides %} -{{ speakerdeck('ffa9b6dea6dc4a8eb207b9982ed6e1bd', '1.33333333333333')|raw }} +{{ speakerdeck('ffa9b6dea6dc4a8eb207b9982ed6e1bd', '1.33333333333333') }} {% endblock %} {% block feedback %} -{{ tweet('@opdavies @Horls @mhwelander @ThisisZone @mozzy16 Thanks for a top night of knowledge sharing! #drupal #episerver #sitecore #umbraco #h5yr

— umBristol (@umBristol) August 25, 2015')|raw }} +{{ tweet('@opdavies @Horls @mhwelander @ThisisZone @mozzy16 Thanks for a top night of knowledge sharing! #drupal #episerver #sitecore #umbraco #h5yr

— umBristol (@umBristol) August 25, 2015') }} {% endblock %} diff --git a/source/_talks/2015-10-14-sculpin.md b/source/_talks/2015-10-14-sculpin.md index 32c86282..36253b99 100644 --- a/source/_talks/2015-10-14-sculpin.md +++ b/source/_talks/2015-10-14-sculpin.md @@ -24,7 +24,7 @@ You can [view the full slides](/slides/phpsw/building-static-websites-with-sculp {% endblock %} {% block slides %} -{{ speakerdeck('6c9c4be1a1344f1291ff13a391674a66', '1.37081659973226')|raw }} +{{ speakerdeck('6c9c4be1a1344f1291ff13a391674a66', '1.37081659973226') }} {% endblock %} {% block video %} @@ -32,5 +32,5 @@ You can [view the full slides](/slides/phpsw/building-static-websites-with-sculp {% endblock %} {% block feedback %} -{{ tweet('Simple and very cool use of video in @opdavies lightning talk @phpsw to show how to do things

— Stuart Herbert (@stuherbert) October 14, 2015')|raw }} +{{ tweet('Simple and very cool use of video in @opdavies lightning talk @phpsw to show how to do things

— Stuart Herbert (@stuherbert) October 14, 2015') }} {% endblock %} diff --git a/source/_talks/2016-03-05-getting-started-with-drupal-8-module-development.md b/source/_talks/2016-03-05-getting-started-with-drupal-8-module-development.md index b18b32a3..16807260 100644 --- a/source/_talks/2016-03-05-getting-started-with-drupal-8-module-development.md +++ b/source/_talks/2016-03-05-getting-started-with-drupal-8-module-development.md @@ -43,11 +43,11 @@ What we won’t be covering: {% endblock %} {% block slides %} -{{ speakerdeck('0041804e52664d12a8e31cd118264813', '1.77777777777778')|raw }} +{{ speakerdeck('0041804e52664d12a8e31cd118264813', '1.77777777777778') }} {% endblock %} {% block feedback %} -{{ tweet('@opdavies good talk on Getting started with Drupal 8 module development! πŸ˜€

— Michael trestianu (@Tresti88) March 5, 2016')|raw }} -{{ tweet('@opdavies Great talk. Thanks.

— John Bloomfield (@jbloomfield) March 5, 2016')|raw }} -{{ tweet('@opdavies definitely went well , I learnt from it , as did a others .

— tim marsh (@timmarsh) March 5, 2016')|raw }} +{{ tweet('@opdavies good talk on Getting started with Drupal 8 module development! πŸ˜€

— Michael trestianu (@Tresti88) March 5, 2016') }} +{{ tweet('@opdavies Great talk. Thanks.

— John Bloomfield (@jbloomfield) March 5, 2016') }} +{{ tweet('@opdavies definitely went well , I learnt from it , as did a others .

— tim marsh (@timmarsh) March 5, 2016') }} {% endblock %} diff --git a/src/AppBundle/Twig/SpeakerDeckExtension.php b/src/AppBundle/Twig/SpeakerDeckExtension.php index 04a96e8d..f443a088 100644 --- a/src/AppBundle/Twig/SpeakerDeckExtension.php +++ b/src/AppBundle/Twig/SpeakerDeckExtension.php @@ -13,13 +13,14 @@ class SpeakerDeckExtension extends Twig_Extension public function getFunctions() { return [ - new Twig_SimpleFunction('speakerdeck', [$this, 'embedCode']), + new Twig_SimpleFunction('speakerdeck', [$this, 'embedCode'], [ + 'is_safe' => ['html'] + ]), ]; } public function embedCode($dataId, $dataRatio) { -// return sprintf( '', $dataId, diff --git a/src/AppBundle/Twig/TweetExtension.php b/src/AppBundle/Twig/TweetExtension.php index 80a9bf84..a4c70eb4 100644 --- a/src/AppBundle/Twig/TweetExtension.php +++ b/src/AppBundle/Twig/TweetExtension.php @@ -13,7 +13,9 @@ class TweetExtension extends Twig_Extension public function getFunctions() { return [ - new Twig_SimpleFunction('tweet', [$this, 'render']), + new Twig_SimpleFunction('tweet', [$this, 'render'], [ + 'is_safe' => ['html'] + ]), ]; } diff --git a/src/AppBundle/Twig/VimeoExtension.php b/src/AppBundle/Twig/VimeoExtension.php index 6791988e..fb974085 100644 --- a/src/AppBundle/Twig/VimeoExtension.php +++ b/src/AppBundle/Twig/VimeoExtension.php @@ -10,7 +10,9 @@ class VimeoExtension extends Twig_Extension public function getFunctions() { return [ - new Twig_SimpleFunction('vimeo', [$this, 'embedCode']) + new Twig_SimpleFunction('vimeo', [$this, 'embedCode'], [ + 'is_safe' => ['html'] + ]) ]; }