{% endfor %}
diff --git a/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md b/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md
deleted file mode 100644
index df4cdb97..00000000
--- a/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md
+++ /dev/null
@@ -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:
----
diff --git a/source/_talks/2016-03-08-drupal-vm-generator-nwdug.md b/source/_talks/2016-03-08-drupal-vm-generator-nwdug.md
deleted file mode 100644
index feea1df4..00000000
--- a/source/_talks/2016-03-08-drupal-vm-generator-nwdug.md
+++ /dev/null
@@ -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:
----
-An impromptu lightning talk about the [Drupal VM Generator][0] project.
-
-[0]: https://github.com/opdavies/drupal-vm-generator
-[1]: {{page.video}}
diff --git a/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md b/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md
deleted file mode 100644
index a57bb2c2..00000000
--- a/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md
+++ /dev/null
@@ -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:
-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.
diff --git a/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md b/source/_talks/dancing-for-drupal.md
similarity index 84%
rename from source/_talks/2015-08-25-dancing-for-drupal-umbristol.md
rename to source/_talks/dancing-for-drupal.md
index ecf9c1b5..420ebfa4 100644
--- a/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md
+++ b/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:
-tags:
- - meetup
- - umbristol
- - drupal
+tags: [meetup, umbristol, drupal]
tweets: yes
-logo: assets/images/talks/logos/umbristol.jpeg
-logo_link: https://www.meetup.com/umBristol/events/223807592
+events:
+ - { 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.
diff --git a/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md b/source/_talks/deploying-php-with-fabric.md
similarity index 93%
rename from source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md
rename to source/_talks/deploying-php-with-fabric.md
index d8ea7809..a85f03a8 100644
--- a/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md
+++ b/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).
diff --git a/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md b/source/_talks/drupal-8-module-development.md
similarity index 90%
rename from source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md
rename to source/_talks/drupal-8-module-development.md
index f6e7de7e..8cddeb60 100644
--- a/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md
+++ b/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:
-date: 2016-03-05 14:00
video: https://www.youtube.com/watch?v=qO_Wh5WE3VA
video_embed:
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!
diff --git a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md b/source/_talks/drupal-8-rejoining-the-herd.md
similarity index 82%
rename from source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md
rename to source/_talks/drupal-8-rejoining-the-herd.md
index 6576bbf8..b17e98a0 100644
--- a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md
+++ b/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:
-logo: assets/images/talks/logos/php-south-coast-2016.png
-logo_link: http://2016.phpsouthcoast.co.uk/schedule
+events:
+ - { 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!
diff --git a/source/_talks/2015-04-08-drupal-8-phpsw.md b/source/_talks/drupal-8.md
similarity index 83%
rename from source/_talks/2015-04-08-drupal-8-phpsw.md
rename to source/_talks/drupal-8.md
index c7d7fe7a..6ac30311 100644
--- a/source/_talks/2015-04-08-drupal-8-phpsw.md
+++ b/source/_talks/drupal-8.md
@@ -1,19 +1,14 @@
---
title: Drupal 8
-location: PHPSW
slides: https://speakerdeck.com/opdavies/drupal-8
slides_embed:
video: https://www.youtube.com/watch?v=36zCxPrOOzM
video_embed:
joindin: https://joind.in/talk/view/14380
-tags:
- - meetup
- - phpsw
- - drupal
- - drupal-8
+tags: [meetup, phpsw, drupal, drupal-8]
tweets: yes
-logo: assets/images/talks/logos/phpsw.png
-logo_link: http://phpsw.uk/talks/drupal-8
+events:
+ - { id: phpsw, date: '2015-04-08' }
---
This was a ten minute lightning talk, designed to highlight the major changes coming in Drupal 8.
diff --git a/source/_talks/2014-08-19-drupal-association-swdug.md b/source/_talks/drupal-association.md
similarity index 65%
rename from source/_talks/2014-08-19-drupal-association-swdug.md
rename to source/_talks/drupal-association.md
index cdf413fc..9ae3bc3b 100644
--- a/source/_talks/2014-08-19-drupal-association-swdug.md
+++ b/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.
diff --git a/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md b/source/_talks/drupal-development-with-composer.md
similarity index 88%
rename from source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md
rename to source/_talks/drupal-development-with-composer.md
index 0f126362..4bccd376 100644
--- a/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md
+++ b/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: ''
video: https://www.youtube.com/watch?v=Yi_FPI3xHwc
video_embed: ''
-logo: assets/images/talks/logos/phpsw.png
-logo_link: http://phpsw.uk/talks/modern-drupal-development-with-composer
+events:
+ - { 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.
diff --git a/source/_talks/2013-07-10-drupal-ldap-swdug.md b/source/_talks/drupal-ldap.md
similarity index 54%
rename from source/_talks/2013-07-10-drupal-ldap-swdug.md
rename to source/_talks/drupal-ldap.md
index 71584202..0784e338 100644
--- a/source/_talks/2013-07-10-drupal-ldap-swdug.md
+++ b/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' }
---
diff --git a/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md b/source/_talks/drupal-vm-generator.md
similarity index 69%
rename from source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md
rename to source/_talks/drupal-vm-generator.md
index 48b354a3..7df5d486 100644
--- a/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md
+++ b/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:
- - drupal-vm
- - drupal-vm-generator
- - meetup
- - symfony
+tags: [drupal-vm, drupal-vm-generator, meetup, symfony]
slides: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator
slides_embed:
-logo: assets/images/talks/logos/drupal-bristol.jpg
-logo_link: https://groups.drupal.org/node/510443
+events:
+ - { id: nwdug, date: '2016-03-08' }
+ - { id: drupal-bristol, date: '2016-04-02' }
---
An short talk about the [Drupal VM Generator][1] project.
diff --git a/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md b/source/_talks/drupal-vm-meet-symfony-console.md
similarity index 84%
rename from source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md
rename to source/_talks/drupal-vm-meet-symfony-console.md
index c477be62..a4f6bd74 100644
--- a/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md
+++ b/source/_talks/drupal-vm-meet-symfony-console.md
@@ -1,16 +1,11 @@
---
title: Drupal VM, Meet Symfony Console
-location: DrupalCamp Bristol 2016
-logo: assets/images/talks/logos/drupalcamp-bristol-2016.png
-logo_link: https://www.drupalcampbristol.co.uk
-tags:
- - conference
- - php
- - drupal-vm
- - symfony
+tags: [conference, php, drupal-vm, symfony]
slides: https://speakerdeck.com/opdavies/drupal-vm-meet-symfony-console
slides_embed:
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._
diff --git a/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md b/source/_talks/drupalorg-2015.md
similarity index 56%
rename from source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md
rename to source/_talks/drupalorg-2015.md
index 9e80b5d4..ed762145 100644
--- a/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md
+++ b/source/_talks/drupalorg-2015.md
@@ -1,13 +1,9 @@
---
title: Drupal.org in 2015: What's Coming Next
-location: DrupalCamp London 2015
-logo_link: http://2015.drupalcamplondon.co.uk
-tags:
- - conference
- - drupalcamp
- - drupalcamp-london
- - drupal-association
-logo: assets/images/talks/logos/drupalcamp-london-2015.png
+tags: [conference, drupalcamp, drupalcamp-london, drupal-association]
slides: https://speakerdeck.com/opdavies/drupal-dot-org-in-2015
slides_embed:
+events:
+ - { id: drupalcamp-brighton-2015, date: '2015-01-18' }
+ - { id: drupalcamp-london-2015, date: '2015-02-28' }
---
diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md b/source/_talks/drush-make-drupalbristol.md
similarity index 65%
rename from source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md
rename to source/_talks/drush-make-drupalbristol.md
index 4661d32c..8cc238b4 100644
--- a/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md
+++ b/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:
-tags:
- - meetup
- - drupal
- - drupal-bristol
- - drush
- - drush-make
+tags: [meetup, drupal, drupal-bristol, drush, drush-make]
+events:
+ - { id: drupal-bristol, date: '2014-07-02' }
---
diff --git a/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md b/source/_talks/getting-your-data-into-drupal-8.md
similarity index 85%
rename from source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md
rename to source/_talks/getting-your-data-into-drupal-8.md
index 61d9307f..811061ae 100644
--- a/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md
+++ b/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:
+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.
diff --git a/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md b/source/_talks/git-flow.md
similarity index 70%
rename from source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md
rename to source/_talks/git-flow.md
index 854be058..75bc1895 100644
--- a/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md
+++ b/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:
video: https://www.youtube.com/watch?v=T-miCpHxfds
video_embed:
-tags:
- - conference
- - drupalcamp
- - drupalcamp-london
- - git
- - git-flow
+tags: [conference, drupalcamp, drupalcamp-london, git, git-flow]
slug: git-flow
tweets: yes
+events:
+ - { id: drupalcamp-london-2014, date: '2014-03-01' }
---
diff --git a/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md b/source/_talks/goodbye-drush-make-hello-composer.md
similarity index 88%
rename from source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md
rename to source/_talks/goodbye-drush-make-hello-composer.md
index 3ccc35f6..f2931395 100644
--- a/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md
+++ b/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: ''
+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.
diff --git a/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md b/source/_talks/it-all-started-with-a-patch.md
similarity index 72%
rename from source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md
rename to source/_talks/it-all-started-with-a-patch.md
index 080d5edc..b85d1a47 100644
--- a/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md
+++ b/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:
-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.
diff --git a/source/_talks/2015-10-14-sculpin-phpsw.md b/source/_talks/sculpin.md
similarity index 86%
rename from source/_talks/2015-10-14-sculpin-phpsw.md
rename to source/_talks/sculpin.md
index 81a23dc0..ea8bb8fb 100644
--- a/source/_talks/2015-10-14-sculpin-phpsw.md
+++ b/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:
code: https://github.com/opdavies/sculpin-demo
joindin: https://joind.in/talk/view/15486
-tags:
- - meetups
- - phpsw
- - sculpin
+tags: [meetups, phpsw, sculpin]
tweets: yes
video:
embed:
url: https://www.youtube.com/watch?v=aN53arCKZAU
-logo: assets/images/talks/logos/phpsw.png
-logo_link: http://phpsw.uk/talks/building-static-sites-with-sculpin
+events:
+ - { 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.
diff --git a/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md b/source/_talks/test-drive-twig-with-sculpin.md
similarity index 80%
rename from source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md
rename to source/_talks/test-drive-twig-with-sculpin.md
index 3e9d5eaf..896a46b6 100644
--- a/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md
+++ b/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:
code: https://github.com/opdavies/sculpin-demo
-tags:
- - conference
- - drupalcamp
- - drupalcamp-north
- - sculpin
- - twig
+tags: [conference, drupalcamp, drupalcamp-north, sculpin, twig]
tweets: yes
-logo: assets/images/talks/logos/drupalcamp-north-2015.png
-logo_link: http://drupalcampnorth.org/session/test-drive-twig-sculpin
+events:
+ - { 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.
diff --git a/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md b/source/_talks/test-driven-drupal-simpletest-phpunit.md
similarity index 85%
rename from source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md
rename to source/_talks/test-driven-drupal-simpletest-phpunit.md
index 87cad353..32ccd72f 100644
--- a/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md
+++ b/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:
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.
diff --git a/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md b/source/_talks/what-is-this-drupal-thing.md
similarity index 61%
rename from source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md
rename to source/_talks/what-is-this-drupal-thing.md
index cc283059..e0fdd9a1 100644
--- a/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md
+++ b/source/_talks/what-is-this-drupal-thing.md
@@ -1,12 +1,9 @@
---
title: So, what is this Drupal thing?
-location: Unified Diff
-logo: assets/images/talks/logos/unified-diff.png
-logo_link: http://unifieddiff.co.uk
+location:
video: https://vimeo.com/49827006
video_embed:
-tags:
- - meetup
- - drupal
- - unified-diff
+tags: [meetup, drupal, unified-diff]
+events:
+ - { id: udiff, date: '2012-09-05' }
---
diff --git a/source/talks.html.twig b/source/talks.html.twig
index 0d409cc9..3b3d1e43 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -7,18 +7,17 @@ use: [talks, posts]
---
Talks
+
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 get in touch.
+
+
There is also information about events that I’ve attended and spoken at on my Lanyrd and Joind.in profiles.
+
{% 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 %}
- {{ event.title }}
- {{ event.date }}
- {{ event.talk.title }}
- {{ event.talk.url }}
-{% endfor %}
+{% include "talks-table" with { events: events|sortbyfield('date')|reverse } %}