From 7463e87e9db2ca7ed96a8dd395811bc5eb5124e8 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 14 May 2016 00:53:41 +0100 Subject: [PATCH 1/2] Updated talks --- .../2012-09-05-what-is-this-drupal-thing.md | 9 +++---- source/_talks/2014-03-01-git-flow.md | 8 ++++-- .../2014-07-02-drush-make-drupalbristol.md | 7 +++-- source/_talks/2015-04-08-drupal-8.md | 22 +++++----------- ...2015-07-25-test-drive-twig-with-sculpin.md | 19 ++++++-------- .../_talks/2015-08-25-dancing-for-drupal.md | 16 ++++-------- source/_talks/2015-10-14-sculpin.md | 26 +++++++------------ ...tarted-with-drupal-8-module-development.md | 23 +++++----------- .../_talks/2016-03-09-drupal-vm-generator.md | 10 ++----- .../2016-04-20-drupal-vm-generator-2.md | 12 ++++----- .../2016-06-11-drupal-8-rejoining-the-herd.md | 6 ++--- 11 files changed, 58 insertions(+), 100 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 8c053b71..8b740405 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 @@ -1,18 +1,17 @@ --- nav: talks -title: So, What is This Drupal Thing? +title: So, what is this Drupal thing? type: meetup event: name: Unified Diff website: http://unifieddiff.co.uk location: Cardiff, UK -video: https://vimeo.com/49827006 +video: + embed: + url: https://vimeo.com/49827006 slug: what-is-this-drupal-thing tags: - meetup - drupal - unified-diff --- -{% block video %} -{{ vimeo('49827006') }} -{% endblock %} diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md index 6ace4a0d..15b17cbf 100644 --- a/source/_talks/2014-03-01-git-flow.md +++ b/source/_talks/2014-03-01-git-flow.md @@ -6,8 +6,12 @@ event: name: DrupalCamp London 2014 website: http://2014.drupalcamplondon.co.uk location: London, UK -slides: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow -video: https://www.youtube.com/watch?v=T-miCpHxfds +slides: + embed: + url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow +video: + embed: + url: https://www.youtube.com/watch?v=T-miCpHxfds tags: - conference - drupalcamp diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md index 8f84e4f8..c7b8cf91 100644 --- a/source/_talks/2014-07-02-drush-make-drupalbristol.md +++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md @@ -6,7 +6,9 @@ event: name: Bristol Drupal website: http://www.drupalbristol.org.uk location: Bristol, UK -slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol +slides: + embed: + url: https://speakerdeck.com/opdavies/drush-make-drupalbristol tags: - meetup - drupal @@ -14,6 +16,3 @@ tags: - drush - drush-make --- -{% block slides %} -{{ 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 da95ab23..5c98018c 100644 --- a/source/_talks/2015-04-08-drupal-8.md +++ b/source/_talks/2015-04-08-drupal-8.md @@ -6,8 +6,12 @@ event: name: PHPSW website: http://phpsw.uk location: Bristol, UK -slides: https://speakerdeck.com/opdavies/drupal-8 -video: https://www.youtube.com/watch?v=36zCxPrOOzM +slides: + embed: + url: https://speakerdeck.com/opdavies/drupal-8 +video: + embed: + url: https://www.youtube.com/watch?v=36zCxPrOOzM joindin: https://joind.in/talk/view/14380 tags: - meetup @@ -16,20 +20,6 @@ tags: - drupal-8 tweets: yes --- -{% block abstract %} 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 %} -{{ speakerdeck('46ba4ba577d94a32b7abdade610ceb69', '1.29456384323641') }} -{% endblock %} - -{% block video %} -{{ youtube('36zCxPrOOzM') }} -{% 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') }} -{% 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 2882c2fa..9c32695a 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 @@ -6,7 +6,9 @@ event: name: DrupalCamp North 2015 website: http://drupalcampnorth.org location: Sunderland, UK -slides: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin +slides: + embed: + url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin code: https://github.com/opdavies/sculpin-demo tags: - conference @@ -16,16 +18,11 @@ tags: - twig tweets: yes --- -{% block abstract %} -[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. +[Sculpin][1] is a static site generator written in PHP, and based on [Symfony components][2]. It uses [YAML][3] and [Twig][4], 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 %} -{{ 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') }} -{% endblock %} +[1]: https://sculpin.io +[2]: http://symfony.com/doc/current/components/index.html +[3]: http://yaml.org +[4]: http://twig.sensiolabs.org diff --git a/source/_talks/2015-08-25-dancing-for-drupal.md b/source/_talks/2015-08-25-dancing-for-drupal.md index d6c5356a..4c03fce2 100644 --- a/source/_talks/2015-08-25-dancing-for-drupal.md +++ b/source/_talks/2015-08-25-dancing-for-drupal.md @@ -6,15 +6,16 @@ event: name: umBristol (Bristol Umbraco user group) website: http://umbristol.co.uk location: Bristol, UK -slides: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal +slides: + embed: + url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal tags: - meetup - umbristol - drupal tweets: yes --- -{% block abstract %} -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. +As part of their [CMS Dance-Off][1], I was selected to speak about Drupal alongside other speakers representing Umbraco, Sitecore and Episerver. The points to cover were: @@ -27,12 +28,5 @@ 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 %} -{{ 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') }} -{% endblock %} +[1]: http://www.meetup.com/umBristol/events/223807592 diff --git a/source/_talks/2015-10-14-sculpin.md b/source/_talks/2015-10-14-sculpin.md index 36253b99..28414479 100644 --- a/source/_talks/2015-10-14-sculpin.md +++ b/source/_talks/2015-10-14-sculpin.md @@ -6,7 +6,9 @@ event: name: PHPSW website: http://phpsw.uk location: Bristol, UK -slides: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin +slides: + embed: + url: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin code: https://github.com/opdavies/sculpin-demo joindin: https://joind.in/talk/view/15486 tags: @@ -14,23 +16,15 @@ tags: - phpsw - sculpin tweets: yes +video: + embed: + url: https://www.youtube.com/watch?v=aN53arCKZAU --- -{% block abstract %} -[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. +[Sculpin][0] 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! -You can [view the full slides](/slides/phpsw/building-static-websites-with-sculpin/), including the embedded videos. -{% endblock %} +You can [view the full slides][1], including the embedded videos. -{% block slides %} -{{ speakerdeck('6c9c4be1a1344f1291ff13a391674a66', '1.37081659973226') }} -{% endblock %} - -{% block video %} -{{ youtube('aN53arCKZAU') }} -{% 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') }} -{% endblock %} +[0]: http://sculpin.io +[1]: {{site.url}}/slides/phpsw/building-static-websites-with-sculpin/ 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 ae798003..44314f49 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 @@ -14,8 +14,13 @@ tags: - drupal-8 tweets: yes code: https://github.com/opdavies/dclondon16-d8-module -slides: https://speakerdeck.com/opdavies/getting-started-with-drupal-8-module-development +slides: + embed: + url: https://speakerdeck.com/opdavies/getting-started-with-drupal-8-module-development date: 2016-03-05 14:00 +video: + embed: + url: https://www.youtube.com/watch?v=qO_Wh5WE3VA meta: og: title: Getting Started with Drupal 8 Module Development @@ -25,7 +30,6 @@ meta: height: 540 width: 960 --- -{% block abstract %} New to object-orientated PHP, Symfony or YAML, and want to get started building modules in Drupal 8? This is the session for you! In this session, we’ll cover: @@ -40,18 +44,3 @@ What we won’t be covering: * Automated testing in PHPUnit or Simpletest. * Adding third party libraries and external dependencies via Composer. -{% endblock %} - -{% block slides %} -{{ speakerdeck('0041804e52664d12a8e31cd118264813', '1.77777777777778') }} -{% endblock %} - -{% block video %} -{{ youtube('qO_Wh5WE3VA') }} -{% endblock %} - -{% block feedback %} -{{ 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/source/_talks/2016-03-09-drupal-vm-generator.md b/source/_talks/2016-03-09-drupal-vm-generator.md index 6311590f..f236f8cd 100644 --- a/source/_talks/2016-03-09-drupal-vm-generator.md +++ b/source/_talks/2016-03-09-drupal-vm-generator.md @@ -12,12 +12,6 @@ tags: - drupal-vm-generator - symfony --- -{% block abstract %} -An impromptu lightning talk about the [Drupal VM Generator][1] project. -{% endblock %} +An impromptu lightning talk about the [Drupal VM Generator][0] project. -{% block video %} -{{ youtube('U1pbKAAO2Wo?start=3690') }} -{% endblock %} - -[1]: https://github.com/opdavies/drupal-vm-generator +[0]: https://github.com/opdavies/drupal-vm-generator diff --git a/source/_talks/2016-04-20-drupal-vm-generator-2.md b/source/_talks/2016-04-20-drupal-vm-generator-2.md index b0af6e02..c560cee1 100644 --- a/source/_talks/2016-04-20-drupal-vm-generator-2.md +++ b/source/_talks/2016-04-20-drupal-vm-generator-2.md @@ -11,12 +11,10 @@ tags: - drupal-vm - drupal-vm-generator - symfony -slides: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator +slides: + embed: + url: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator --- -{% block abstract %} -An short talk about the [Drupal VM Generator](https://github.com/opdavies/drupal-vm-generator) project. -{% endblock %} +An short talk about the [Drupal VM Generator][1] project. -{% block slides %} -{{ speakerdeck('a27ee1d2bfed4a209dc395fa455acb41', '1.37081659973226') }} -{% endblock %} +[1]: https://github.com/opdavies/drupal-vm-generator diff --git a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd.md b/source/_talks/2016-06-11-drupal-8-rejoining-the-herd.md index 8130e952..0fdb141c 100644 --- a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd.md +++ b/source/_talks/2016-06-11-drupal-8-rejoining-the-herd.md @@ -12,8 +12,8 @@ tags: - drupal - drupal-8 --- -{% block abstract %} -[Drupal 8](https://www.drupal.org/8) was (finally) released on November 19th 2015, after almost 4 years of work and code commits by over 3,200 different contributors. Whilst it’s pretty much the same as the Drupal that we know and, hopefully, love, a lot has changed behind the scenes and under the hood! +[Drupal 8][0] was (finally) released on November 19th 2015, after almost 4 years of work and code commits by over 3,200 different contributors. Whilst it’s pretty much the same as the Drupal that we know and, hopefully, love, a lot has changed behind the scenes and under the hood! In this talk, I'll highlight some of the new features and improvements in Drupal 8, and discuss some of the benefits to Drupal site builders, themers, and module developers. I'll also talk about some of the non-technical changes and the cultural shift from "not invented here" to "proudly found elsewhere", and how we are rejoining the PHP herd. -{% endblock %} + +[0]: https://www.drupal.org/8 From dc76a11106e3db60bc899547154458c05cf92bb9 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 14 May 2016 00:55:00 +0100 Subject: [PATCH 2/2] Updated templates --- source/_layouts/base.html.twig | 20 +++---- source/_layouts/talk.html.twig | 101 +++++++++++++-------------------- 2 files changed, 49 insertions(+), 72 deletions(-) diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index 1a809662..06da707e 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -1,23 +1,23 @@ - {{ include('head.html.twig') }} + {{ include('head') }} - {{ include('nav.html.twig') }} + {{ include('nav') }}
- {% block content_wrapper %} -
- {% block content_top %}{% endblock %} +
+ {% block content_top %}{% endblock %} + {% block content_wrapper %} {% block content %}{% endblock %} - {% block content_bottom %}{% endblock %} -
- {% endblock %} + {% endblock %} + {% block content_bottom %}{% endblock %} +
- {{ include('sidebar.html.twig') }} + {{ include('sidebar') }}
{# .row #}
{# .container #} - {{ include('footer.html.twig') }} + {{ include('footer') }} diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig index bc0887bd..f7a4a093 100644 --- a/source/_layouts/talk.html.twig +++ b/source/_layouts/talk.html.twig @@ -1,65 +1,42 @@ -{% extends 'default.html.twig' %} +{% extends "base" %} -{% block content_wrapper %} -
-

{{ page.title }}

- - {% if page.blocks.abstract %} -
-

Abstract

- -
- {{ page.blocks.abstract|raw }} -
-
- {% endif %} - -
-

Details

- -
    -
  • Event: - {% if page.event.website %} - {{ page.event.name }} - {% else %} - {{ page.event.name }} - {% endif %} -
    • -
  • Date: {{ page.date|date(site.default_date_format) }}
    • -
  • Location: {{ page.event.location }}
    • -
-
- - {% if page.blocks.slides %} -
-

Slides

- -
- {{ page.blocks.slides|raw }} -
-
- {% endif %} - - {% if page.blocks.video %} -
-

Video

- -
- {{ page.blocks.video|raw }} -
-
- {% endif %} - - {% if page.blocks.feedback %} - - {% endif %} -
+{% block content_top %} +

{{ page.title }}

{% endblock %} -{% block body_classes %}page--talk{% endblock %} +{% block content_wrapper %} + {% block content %}{% endblock %} + + {% if page.event %} +

Details

+ + + {% endif %} + + {% if page.slides.embed %} +
+

Slides

+ +
+ {{ page.slides.embed|raw }} +
+
+ {% endif %} + + {% if page.video.embed %} +

Video

+ +
+ {{ page.video.embed|raw }} +
+ {% endif %} +{% endblock %}