From 33198841a40bfa557f240a1115a8ee5170038f11 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 29 Dec 2015 00:39:54 +0000 Subject: [PATCH] Added slides and video blocks --- source/_layouts/talk.html.twig | 14 ++++++++------ .../_talks/2012-09-05-what-is-this-drupal-thing.md | 5 +++-- source/_talks/2014-03-01-git-flow.md | 12 ++++++++---- .../_talks/2014-07-02-drush-make-drupalbristol.md | 7 ++++--- source/_talks/2015-04-08-drupal-8.md | 11 +++++++---- .../2015-07-25-test-drive-twig-with-sculpin.md | 10 +++++++--- source/_talks/2015-08-25-dancing-for-drupal.md | 10 +++++++--- source/_talks/2015-10-14-sculpin.md | 10 +++++++--- 8 files changed, 51 insertions(+), 28 deletions(-) diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig index edf63c7a5..d164311b5 100644 --- a/source/_layouts/talk.html.twig +++ b/source/_layouts/talk.html.twig @@ -15,14 +15,16 @@ {{ page.blocks.content|raw }} - {% if page.slides.embed %} -
+ {% if page.blocks.slides %}

Slides

- {{ page.slides.embed|raw }} + + {{ page.blocks.slides|raw }} {% endif %} - {% if page.vimeo.id %} - + {% if page.blocks.video %} +

Video

+ + {{ page.blocks.video|raw }} {% endif %} -{% endblock content_wrapper %} +{% endblock %} 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 2241c4410..a129dcb51 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 @@ -6,11 +6,12 @@ event: website: http://unifieddiff.co.uk location: Cardiff, UK video: https://vimeo.com/49827006 -vimeo: - id: 49827006 slug: what-is-this-drupal-thing tags: - meetup - drupal - unified-diff --- +{% block video %} + +{% endblock %} diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md index 47de4bd3b..e17fa63e2 100644 --- a/source/_talks/2014-03-01-git-flow.md +++ b/source/_talks/2014-03-01-git-flow.md @@ -5,11 +5,8 @@ event: name: DrupalCamp London 2014 website: http://2014.drupalcamplondon.co.uk location: London, UK -slides: - url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow - embed: +slides: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow video: https://www.youtube.com/watch?v=T-miCpHxfds -youtube: T-miCpHxfds tags: - conference - drupalcamp @@ -18,3 +15,10 @@ tags: - git-flow slug: git-flow --- +{% block slides %} + +{% endblock %} + +{% block video %} + +{% endblock %} diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md index 2f33281db..5e845741e 100644 --- a/source/_talks/2014-07-02-drush-make-drupalbristol.md +++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md @@ -5,9 +5,7 @@ event: name: Bristol Drupal user group website: http://drupalbristol.org.uk location: Bristol, UK -slides: - url: https://speakerdeck.com/opdavies/drush-make-drupalbristol - embed: +slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol tags: - meetup - drupal @@ -15,3 +13,6 @@ tags: - drush - drush-make --- +{% block slides %} + +{% endblock %} diff --git a/source/_talks/2015-04-08-drupal-8.md b/source/_talks/2015-04-08-drupal-8.md index a3660a44f..f9e3d83bc 100644 --- a/source/_talks/2015-04-08-drupal-8.md +++ b/source/_talks/2015-04-08-drupal-8.md @@ -5,11 +5,8 @@ event: name: PHPSW website: http://phpsw.uk location: Bristol, UK -slides: - url: https://speakerdeck.com/opdavies/drupal-8 - embed: +slides: https://speakerdeck.com/opdavies/drupal-8 video: https://www.youtube.com/watch?v=36zCxPrOOzM -youtube: 36zCxPrOOzM joindin: https://joind.in/talk/view/14380 tags: - meetup @@ -17,6 +14,12 @@ tags: - drupal - drupal-8 --- +{% block content %} This was a ten minute lightning talk, designed to highlight the major changes coming in Drupal 8. I categorised the technical changes into groups for site builders, developers and themers, and also highlighted the cultural shift from "not invented here" to "proudly found elsewhere" and the benefits that brings. +{% endblock %} + +{% block slides %} + +{% 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 7edd7c2cf..5ef228ba4 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 @@ -5,9 +5,7 @@ event: name: DrupalCamp North 2015 website: http://drupalcampnorth.org location: Sunderland, UK -slides: - url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin - embed: +slides: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin code: https://github.com/opdavies/sculpin-demo tags: - conference @@ -16,6 +14,12 @@ tags: - sculpin - twig --- +{% block content %} [Sculpin](https://sculpin.io) is a static site generator written in PHP, and based on [Symfony components](http://symfony.com/doc/current/components/index.html). It uses [YAML](http://yaml.org/) and [Twig](http://twig.sensiolabs.org/), which makes it very appealing to Drupal people wanting to learn these in preparation for Drupal 8. This session covered how to install Sculpin itself, as well as how to use it to build a static site from Markdown, HTML and Twig templates. We also covered Sculpin concepts such as content types, themes and partials, and Twig layouts, blocks and inheritance, as well as some tips and tricks that I've found whilst developing with Sculpin. +{% endblock %} + +{% block slides %} + +{% endblock %} diff --git a/source/_talks/2015-08-25-dancing-for-drupal.md b/source/_talks/2015-08-25-dancing-for-drupal.md index 5eedf988a..e2f7f8103 100644 --- a/source/_talks/2015-08-25-dancing-for-drupal.md +++ b/source/_talks/2015-08-25-dancing-for-drupal.md @@ -5,14 +5,13 @@ event: name: umBristol (Bristol Umbraco user group) website: http://umbristol.co.uk location: Bristol, UK -slides: - url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal - embed: +slides: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal tags: - meetup - umbristol - drupal --- +{% block content %} As part of their [CMS Dance-Off](http://www.meetup.com/umBristol/events/223807592/), I was selected to speak about Drupal alongside other speakers representing Umbraco, Sitecore and Episerver. The points to cover were: @@ -26,3 +25,8 @@ The points to cover were: * What does the future of your CMS look like? In each point, tried to cover the differences between Drupal core and developing a project using Drupal, as well as between Drupal 7 and Drupal 8, as things like source control and versioning would be approached differently. +{% endblock %} + +{% block slides %} + +{% endblock %} diff --git a/source/_talks/2015-10-14-sculpin.md b/source/_talks/2015-10-14-sculpin.md index 0790c42cc..1939e95fe 100644 --- a/source/_talks/2015-10-14-sculpin.md +++ b/source/_talks/2015-10-14-sculpin.md @@ -5,18 +5,22 @@ event: name: PHPSW website: http://phpsw.uk location: Bristol, UK +slides: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin code: https://github.com/opdavies/sculpin-demo joindin: https://joind.in/talk/view/15486 tags: - meetups - phpsw - sculpin -slides: - url: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin - embed: --- +{% block content %} [Sculpin](http://sculpin.io) is a static site generator written in PHP. It converts Markdown files, Twig templates and standard HTML into a static HTML site that can be easily deployed. This talk will cover a little of the background to Sculpin and what it is, and then will move into some demonstrations of how to build a Sculpin site and what it can do! The full version of the slides are available at , including the embedded videos. +{% endblock %} + +{% block slides %} + +{% endblock %}