Add remaining event data

app/config/sculpin_kernel.yml

@@ -1,16 +1,10 @@
 sculpin_content_types:
     posts:
         permalink: blog/:year/:month/:day/:slug_title/
-        taxonomies:
+        taxonomies: [tags]
-            - tags
-
     projects:
         permalink: projects/:slug_title/
-        taxonomies:
+        taxonomies: [skills, tags]
-            - skills
-            - tags
-
     talks:
-        permalink: talks/:year/:month/:day/:filename/
+        permalink: talks/:slug_title/
-        taxonomies:
+        taxonomies: [tags]
-            - tags

app/config/sculpin_site.yml

@@ -143,3 +143,19 @@ wordpress:
 
 youtube:
     channel_url: https://www.youtube.com/channel/UCkeK0qF9HHUPQH_fvn4ghqQ
+
+talks_events:
+    drupal-bristol: { title: Drupal Bristol, website: https://www.drupalbristol.org.uk }
+    drupalcamp-brighton-2015: { title: DrupalCamp Brighton 2015, website: http://2015.drupalcampbrighton.co.uk }
+    drupalcamp-bristol-2016: { title: DrupalCamp Bristol 2016, website: https://www.drupalcampbristol.org.uk }
+    drupalcamp-london-2014: { title: DrupalCamp London 2014, website: https://drupalcamp.london }
+    drupalcamp-london-2015: { title: DrupalCamp London 2015, website: https://drupalcamp.london }
+    drupalcamp-london-2016: { title: DrupalCamp London 2016, website: https://drupalcamp.london }
+    drupalcamp-london-2017: { title: DrupalCamp London 2017 }
+    drupalcamp-north-2015: { title: DrupalCamp North 2015 }
+    nwdug: { title: NWDUG }
+    phpsc-16: { title: PHP South Coast 2016, website: http://2016.phpsouthcoast.co.uk }
+    phpsw: { title: PHPSW, website: https://phpsw.uk }
+    swdug: { title: 'SWDUG (South Wales Drupal user group)' }
+    umbristol: { title: 'umBristol (Bristol Umbraco user group)' }
+    udiff: { title: Unified Diff }

source/_partials/talks-table.twig

@@ -7,19 +7,21 @@
         </tr>
     </thead>
     <tbody>
-        {% for talk in talks %}
+        {% for event in events %}
             <tr>
                 <td>
-                    {{ talk.date|date(site.default_date_format) }}
+                    {{ event.date|date(site.default_date_format) }}
                 </td>
 
                 <td>
-                    <a href="{{ talk.url }}">
+                    <a href="{{ event.talk.url }}">
-                        {{ talk.title }}
+                        {{ event.talk.title }}
                     </a>
                 </td>
 
-                <td>{{ talk.location }}</td>
+                <td>
+                    {{ event.title }}
+                </td>
             </tr>
         {% endfor %}
     </tbody>

source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md

@@ -1,14 +0,0 @@
----
-title: Drupal.org in 2015: What's Coming Next
-location: DrupalCamp Brighton 2015
-logo_link: http://www.drupalcampbrighton.co.uk/drupalcamp-brighton-2015
-tags:
-    - conference
-    - drupalcamp
-    - drupalcamp-brighton
-    - drupal-association
-slug: drupalorg-2015
-logo: assets/images/talks/logos/drupalcamp-brighton-2015.png
-slides: https://speakerdeck.com/opdavies/drupal-dot-org-in-2015
-slides_embed: <script async class="speakerdeck-embed" data-id="0cf8d7b647c94ae289e9db2b46a9e8f2" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
----

source/_talks/2016-03-08-drupal-vm-generator-nwdug.md

@@ -1,18 +0,0 @@
----
-title: Drupal VM Generator
-location: NWDUG
-code: https://github.com/opdavies/drupal-vm-generator
-tags:
-    - drupal-vm
-    - drupal-vm-generator
-    - meetup
-    - symfony
-logo: assets/images/talks/logos/nwdug.jpeg
-logo_link: https://www.meetup.com/nwdrupal/events/227586977
-video: https://youtu.be/U1pbKAAO2Wo?t=3696
-video_embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/U1pbKAAO2Wo?start=3696" frameborder="0" allowfullscreen></iframe>
----
-An impromptu lightning talk about the [Drupal VM Generator][0] project.
-
-[0]: https://github.com/opdavies/drupal-vm-generator
-[1]: {{page.video}}

source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md

@@ -1,17 +0,0 @@
----
-title: Getting (Your Data) Into Drupal 8
-location: DrupalCamp London 2017
-logo: assets/images/talks/logos/drupalcamp-london-2017.png
-logo_link: http://drupalcamp.london/session/getting-your-data-drupal-8
-slides: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol
-slides_embed: <script async class="speakerdeck-embed" data-id="63e5dfce996e46699e304d50e896477b" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
-tags: [drupalcamp, migration, drupal-8]
-events:
-    - { title: DrupalCamp London 2017, date: 2017-03-05 }
-    - { title: Drupal Bristol, date: 2017-01-18 }
----
-If you’ve moved a site from Drupal 6 to 7, the chances are that you’ve either used the upgrade path to update your old site in-place, or you built a new site from scratch and used the Migrate module from contrib to migrate your data from the old database.
-
-In Drupal 8, things have changed as there’s no upgrade path from Drupal 7 and the Migrate module has been moved into core, though there are still migration related modules available in contrib.
-
-This talk will look at the core Migrate module and how it implements Drupal 8 features such as YAML and the plugin and configuration systems, and how to write your own migrations to get your data into Drupal 8.

source/_talks/dancing-for-drupal.md

@@ -1,15 +1,11 @@
 ---
 title: Dancing for Drupal
-location: umBristol (Bristol Umbraco user group)
 slides: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
 slides_embed: <script async class="speakerdeck-embed" data-id="ffa9b6dea6dc4a8eb207b9982ed6e1bd" data-ratio="1.33333333333333" src="//speakerdeck.com/assets/embed.js"></script>
-tags:
+tags: [meetup, umbristol, drupal]
-    - meetup
-    - umbristol
-    - drupal
 tweets: yes
-logo: assets/images/talks/logos/umbristol.jpeg
+events:
-logo_link: https://www.meetup.com/umBristol/events/223807592
+    - { id: umbristol, date: '2015-08-25' }
 ---
 As part of their [CMS Dance-Off][1], I was selected to speak about Drupal alongside other speakers representing Umbraco, Sitecore and Episerver.
 

source/_talks/deploying-php-with-fabric.md

@@ -3,10 +3,9 @@ title: Deploying PHP Applications with Fabric
 location: Nomad PHP
 slides: ~
 slides_embed: ~
-logo: assets/images/talks/logos/nomad-php.png
-logo_link: ~
 tags: [meetup, php, fabric]
 draft: true
+events: []
 ---
 You’ve built your application, and now you just need to deploy it. There are various ways that this could be done – from (S)FTP, to SCP and rsync, to running commands like “git pull” and “composer install” directly on the server (not recommended).
 

source/_talks/drupal-8-module-development.md

@@ -1,17 +1,10 @@
 ---
 title: Getting Started with Drupal 8 Module Development
-location: DrupalCamp London 2016
+tags: [conference, php, drupal, drupalcamp, drupal-8]
-tags:
-    - conference
-    - php
-    - drupal
-    - drupalcamp
-    - 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: <script async class="speakerdeck-embed" data-id="0041804e52664d12a8e31cd118264813" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
-date: 2016-03-05 14:00
 video: https://www.youtube.com/watch?v=qO_Wh5WE3VA
 video_embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/qO_Wh5WE3VA" frameborder="0" allowfullscreen></iframe>
 meta:
@@ -22,8 +15,9 @@ meta:
             type: 'image/png'
             height: 540
             width: 960
-logo:
+
-logo_link:
+events:
+    - { id: drupalcamp-london-2016, date: '2016-03-05' }
 ---
 New to object-orientated PHP, Symfony or YAML, and want to get started building modules in Drupal 8? This is the session for you!
 

source/_talks/drupal-8-rejoining-the-herd.md

@@ -1,15 +1,10 @@
 ---
 title: Drupal 8: Rejoining the Herd
-location: PHP South Coast 2016
+tags: [conference, php, drupal, drupal-8]
-tags:
-    - conference
-    - php
-    - drupal
-    - drupal-8
 slides: https://speakerdeck.com/opdavies/drupal-rejoining-the-herd
 slides_embed: <script async class="speakerdeck-embed" data-id="440fd6592f474741bc606c96bc32c104" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
-logo: assets/images/talks/logos/php-south-coast-2016.png
+events:
-logo_link: http://2016.phpsouthcoast.co.uk/schedule
+    - { id: phpsc-16, date: '2016-06-11' }
 ---
 [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!
 

source/_talks/drupal-8.md

@@ -1,19 +1,14 @@
 ---
 title: Drupal 8
-location: PHPSW
 slides: https://speakerdeck.com/opdavies/drupal-8
 slides_embed: <script async class="speakerdeck-embed" data-id="46ba4ba577d94a32b7abdade610ceb69" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
 video: https://www.youtube.com/watch?v=36zCxPrOOzM
 video_embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/36zCxPrOOzM" frameborder="0" allowfullscreen></iframe>
 joindin: https://joind.in/talk/view/14380
-tags:
+tags: [meetup, phpsw, drupal, drupal-8]
-    - meetup
-    - phpsw
-    - drupal
-    - drupal-8
 tweets: yes
-logo: assets/images/talks/logos/phpsw.png
+events:
-logo_link: http://phpsw.uk/talks/drupal-8
+    - { id: phpsw, date: '2015-04-08' }
 ---
 This was a ten minute lightning talk, designed to highlight the major changes coming in Drupal 8.
 

source/_talks/drupal-association.md

@@ -1,12 +1,8 @@
 ---
 title: About the Drupal Association
-location: SWDUG
+tags: [meetup, swdug, drupal, drupal-association]
-tags:
-    - meetup
-    - swdug
-    - drupal
-    - drupal-association
 slug: drupal-association
-logo: assets/images/talks/logos/swdug.png
+events:
+    - { id: swdug, date: '2014-08-19' }
 ---
 An impromptu talk about the [Drupal Association](https://association.drupal.org), and what I’ve been working on since joining the Engineering team earlier in the year.

source/_talks/drupal-development-with-composer.md

@@ -1,14 +1,13 @@
 ---
 title: Modern Drupal Development with Composer
 type: Lightning talk
-location: PHPSW
 tags: ['meetups', 'phpsw', 'drupal', 'composer']
 slides: https://speakerdeck.com/opdavies/modern-drupal-development-with-composer
 slides_embed: '<script async class="speakerdeck-embed" data-id="7a1358502526425a9cfd288f85fb32f3" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>'
 video: https://www.youtube.com/watch?v=Yi_FPI3xHwc
 video_embed: '<iframe width="560" height="315" src="https://www.youtube.com/embed/Yi_FPI3xHwc" frameborder="0" allowfullscreen></iframe>'
-logo: assets/images/talks/logos/phpsw.png
+events:
-logo_link: http://phpsw.uk/talks/modern-drupal-development-with-composer
+    - { id: phpsw, date: '2016-11-09' }
 ---
 Building a Drupal application? You no longer need to download archives to add new modules or update core, or deal with Drupal specific tools to manage your codebase.
 

source/_talks/drupal-ldap.md

@@ -1,11 +1,8 @@
 ---
 title: Drupal and the LDAP Module
-location: SWDUG
+tags: [meetup, swdug, drupal, ldap]
-tags:
-    - meetup
-    - swdug
-    - drupal
-    - ldap
 slug: drupal-ldap
 logo: assets/images/talks/logos/swdug.png
+events:
+    - { id: swdug, date: '2013-07-10' }
 ---

source/_talks/drupal-vm-generator.md

@@ -1,16 +1,12 @@
 ---
 title: Drupal VM Generator
-location: Drupal Bristol
 code: https://github.com/opdavies/drupal-vm-generator
-tags:
+tags: [drupal-vm, drupal-vm-generator, meetup, symfony]
-    - drupal-vm
-    - drupal-vm-generator
-    - meetup
-    - symfony
 slides: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator
 slides_embed: <script async class="speakerdeck-embed" data-id="a27ee1d2bfed4a209dc395fa455acb41" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
-logo: assets/images/talks/logos/drupal-bristol.jpg
+events:
-logo_link: https://groups.drupal.org/node/510443
+    - { id: nwdug, date: '2016-03-08' }
+    - { id: drupal-bristol, date: '2016-04-02' }
 ---
 An short talk about the [Drupal VM Generator][1] project.
 

source/_talks/drupal-vm-meet-symfony-console.md

@@ -1,16 +1,11 @@
 ---
 title: Drupal VM, Meet Symfony Console
-location: DrupalCamp Bristol 2016
+tags: [conference, php, drupal-vm, symfony]
-logo: assets/images/talks/logos/drupalcamp-bristol-2016.png
-logo_link: https://www.drupalcampbristol.co.uk
-tags:
-    - conference
-    - php
-    - drupal-vm
-    - symfony
 slides: https://speakerdeck.com/opdavies/drupal-vm-meet-symfony-console
 slides_embed: <script async class="speakerdeck-embed" data-id="56c79770f73f4e47a542a30243437c49" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
 image: drupal-vm-meet-symfony-console.png
+events:
+    - { id: drupalcamp-bristol-2016, date: '2016-07-23' }
 ---
 _TL;DR - Come and learn about Symfony Console, with examples from a real-world project._
 

source/_talks/drupalorg-2015.md

@@ -1,13 +1,9 @@
 ---
 title: Drupal.org in 2015: What's Coming Next
-location: DrupalCamp London 2015
+tags: [conference, drupalcamp, drupalcamp-london, drupal-association]
-logo_link: http://2015.drupalcamplondon.co.uk
-tags:
-    - conference
-    - drupalcamp
-    - drupalcamp-london
-    - drupal-association
-logo: assets/images/talks/logos/drupalcamp-london-2015.png
 slides: https://speakerdeck.com/opdavies/drupal-dot-org-in-2015
 slides_embed: <script async class="speakerdeck-embed" data-id="0cf8d7b647c94ae289e9db2b46a9e8f2" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
+events:
+    - { id: drupalcamp-brighton-2015, date: '2015-01-18' }
+    - { id: drupalcamp-london-2015, date: '2015-02-28' }
 ---

source/_talks/drush-make-drupalbristol.md

@@ -1,13 +1,8 @@
 ---
 title: drush make drupalbristol
-location: Bristol Drupal
-logo_link: http://www.drupalbristol.org.uk
 slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol
 slides_embed: <script async class="speakerdeck-embed" data-id="42605700f102013198de5a5f6f23ab67" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
-tags:
+tags: [meetup, drupal, drupal-bristol, drush, drush-make]
-    - meetup
+events:
-    - drupal
+    - { id: drupal-bristol, date: '2014-07-02' }
-    - drupal-bristol
-    - drush
-    - drush-make
 ---

source/_talks/getting-your-data-into-drupal-8.md

@@ -1,11 +1,11 @@
 ---
 title: Getting (Your Data) Into Drupal 8
-location: Drupal Bristol
-logo: assets/images/talks/logos/drupal-bristol.jpg
-logo_link: https://groups.drupal.org/node/515718
-tags: ['meetup', 'drupal', 'drupal-8']
 slides: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol
 slides_embed: <script async class="speakerdeck-embed" data-id="63e5dfce996e46699e304d50e896477b" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
+tags: [drupalcamp, migration, drupal-8]
+events:
+    - { id: drupal-bristol, date: '2017-01-18' }
+    - { id: drupalcamp-london-2017, date: '2017-03-04' }
 ---
 If you’ve moved a site from Drupal 6 to 7, the chances are that you’ve either used the upgrade path to update your old site in-place, or you built a new site from scratch and used the Migrate module from contrib to migrate your data from the old database.
 

source/_talks/git-flow.md

@@ -1,18 +1,12 @@
 ---
 title: Never Commit to Master - An Introduction to Git Flow
-location: DrupalCamp London 2014
-logo: assets/images/talks/logos/drupalcamp-london-2014.png
-logo_link: http://2014.drupalcamplondon.co.uk
 slides: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow
 slides_embed: <script async class="speakerdeck-embed" data-id="201559e0f103013198dd5a5f6f23ab67" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
 video: https://www.youtube.com/watch?v=T-miCpHxfds
 video_embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/T-miCpHxfds" frameborder="0" allowfullscreen></iframe>
-tags:
+tags: [conference, drupalcamp, drupalcamp-london, git, git-flow]
-    - conference
-    - drupalcamp
-    - drupalcamp-london
-    - git
-    - git-flow
 slug: git-flow
 tweets: yes
+events:
+    - { id: drupalcamp-london-2014, date: '2014-03-01' }
 ---

source/_talks/goodbye-drush-make-hello-composer.md

@@ -1,11 +1,10 @@
 ---
 title: Goodbye Drush Make. Hello Composer!
-location: Drupal Bristol
-logo: assets/images/talks/logos/drupal-bristol.jpg
-logo_link: https://groups.drupal.org/node/514559
 tags: ['meetup', 'drupal', 'composer']
 slides: http://bit.ly/slides-goodbye-drush-make-hello-composer2
 slides_embed: '<script async class="speakerdeck-embed" data-id="1c1e0e129ab34816bd4c4edb5f6642c2" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>'
+events:
+    - { id: drupal-bristol, date: '2016-11-17' }
 ---
 One of the main outcomes of Drupal 8 was “getting off the island” with third-party code included in core and adopting modern best practices from the wider PHP ecosystem - including [Composer][1], PHP’s dependency manager.
 

source/_talks/it-all-started-with-a-patch.md

@@ -1,12 +1,9 @@
 ---
 title: It All Started With A Patch
-location: PHPSW
 tags: [meetup, phpsw, open-source]
 slides: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw
 slides_embed: <script async class="speakerdeck-embed" data-id="5862bdecb7a24cfaa5fc844696fafa0c" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
-logo: assets/images/talks/logos/phpsw.png
-logo_link: http://phpsw.uk/talks/it-started-with-a-patch
 events:
-    - { title: PHPSW, date: 2017-02-08 }
+    - { id: phpsw, date: '2017-02-08' }
 ---
 A crash course of why and how to get involved with open source.

source/_talks/sculpin.md

@@ -1,20 +1,16 @@
 ---
 title: Building Static Websites with Sculpin
-location: PHPSW
 slides: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin
 slides_embed: <script async class="speakerdeck-embed" data-id="6c9c4be1a1344f1291ff13a391674a66" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
 code: https://github.com/opdavies/sculpin-demo
 joindin: https://joind.in/talk/view/15486
-tags:
+tags: [meetups, phpsw, sculpin]
-    - meetups
-    - phpsw
-    - sculpin
 tweets: yes
 video:
     embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/aN53arCKZAU" frameborder="0" allowfullscreen></iframe>
     url: https://www.youtube.com/watch?v=aN53arCKZAU
-logo: assets/images/talks/logos/phpsw.png
+events:
-logo_link: http://phpsw.uk/talks/building-static-sites-with-sculpin
+    - { id: phpsw, date: '2015-10-14' }
 ---
 [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.
 

source/_talks/test-drive-twig-with-sculpin.md

@@ -1,18 +1,12 @@
 ---
 title: Test Drive Twig with Sculpin
-location: DrupalCamp North 2015
 slides: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
 slides_embed: <script async class="speakerdeck-embed" data-id="54589d2e50a3476a9a75aed809e9edf1" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
 code: https://github.com/opdavies/sculpin-demo
-tags:
+tags: [conference, drupalcamp, drupalcamp-north, sculpin, twig]
-    - conference
-    - drupalcamp
-    - drupalcamp-north
-    - sculpin
-    - twig
 tweets: yes
-logo: assets/images/talks/logos/drupalcamp-north-2015.png
+events:
-logo_link: http://drupalcampnorth.org/session/test-drive-twig-sculpin
+    - { id: drupalcamp-north-2015, date: '2015-07-25' }
 ---
 [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.
 

source/_talks/test-driven-drupal-simpletest-phpunit.md

@@ -1,13 +1,10 @@
 ---
 title: Test driven Drupal development with SimpleTest and PHPUnit
-location: DrupalCamp London 2017
-logo: assets/images/talks/logos/drupalcamp-london-2017.png
-logo_link: http://drupalcamp.london/session/test-driven-drupal-development-simpletest-and-phpunit
 slides: https://speakerdeck.com/opdavies/test-driven-drupal-development-with-simpletest-and-phpunit-drupalcamp-london-2017
 slides_embed: <script async class="speakerdeck-embed" data-id="4f12722ed400468b93ebb32a23b3c757" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
 tags: [drupalcamp, simpletest, phpunit, testing]
 events:
-    - { title: DrupalCamp London 2017, date: 2017-03-05 }
+    - { id: drupalcamp-london-2017, date: '2017-03-04' }
 ---
 Testing is important. Why? It allows developers to add new features and edit and refactor existing code without the worry of adding regressions, reduces the reliance on manual testing to discover bugs, and by taking a test driven approach, your implementation code is leaner as you only write what is needed for your tests to pass.
 

source/_talks/what-is-this-drupal-thing.md

@@ -1,12 +1,9 @@
 ---
 title: So, what is this Drupal thing?
-location: Unified Diff
+location: 
-logo: assets/images/talks/logos/unified-diff.png
-logo_link: http://unifieddiff.co.uk
 video: https://vimeo.com/49827006
 video_embed: <iframe src="https://player.vimeo.com/video/49827006" width="640" height="360" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-tags:
+tags: [meetup, drupal, unified-diff]
-    - meetup
+events:
-    - drupal
+    - { id: udiff, date: '2012-09-05' }
-    - unified-diff
 ---

source/talks.html.twig

@@ -7,18 +7,17 @@ use: [talks, posts]
 ---
 <h1>Talks</h1>
 
+<p>I regularly speak at conferences and user groups about a range of subjects including Drupal, Sculpin and Git. If you would like to me to speak at your group or conference, please <a href="/contact/">get in touch</a>.</p>
+
+<p>There is also information about events that I’ve attended and spoken at on my <a href="{{ site.lanyrd.url }}">Lanyrd</a> and <a href="{{ site.joindin.url }}">Joind.in</a> profiles.</p>
+
 {% set events = [] %}
 
 {% for talk in data.talks %}
     {% for event in talk.events %}
-        {% set event = event|merge({ talk: talk }) %}
+        {% set event = event|merge({ talk: talk })|merge(site.talks_events[event.id]) %}
         {% set events = events|merge([event]) %}
     {% endfor %}
 {% endfor %}
 
-{% for event in events|sortbyfield('date')|reverse %}
+{% include "talks-table" with { events: events|sortbyfield('date')|reverse } %}
-    {{ event.title }}<br>
-    {{ event.date }}<br>
-    {{ event.talk.title }}<br>
-    {{ event.talk.url }}<br><br>
-{% endfor %}