{% endfor %}
diff --git a/source/_talks/dancing-for-drupal.md b/source/_talks/dancing-for-drupal.md
index 02a76603..f800d016 100644
--- a/source/_talks/dancing-for-drupal.md
+++ b/source/_talks/dancing-for-drupal.md
@@ -1,7 +1,5 @@
---
-id: dancing-for-drupal
title: Dancing for Drupal
-type: Talk
slides:
url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
embed:
diff --git a/source/_talks/deploying-php-with-fabric.md b/source/_talks/deploying-php-with-fabric.md
deleted file mode 100644
index 7a924282..00000000
--- a/source/_talks/deploying-php-with-fabric.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-id: deploying-php-with-fabric
-title: Deploying PHP Applications with Fabric
-type: Talk
-slides:
- url: https://speakerdeck.com/opdavies/deploying-php-applications-with-fabric
- embed: ''
-video:
- embed: ''
- url: https://www.youtube.com/watch?v=kM0MDUJE8ys
-tags: [meetup, conference, php, fabric]
-meta:
- og:
- title: Deploying PHP Applcations with Fabric
- description: "You've built your PHP application, now learn how to deploy it with Fabric."
- type: website
- image:
- url: /assets/images/talks/deploying-php-fabric.png
- width: 1280
- height: 800
- type: image/png
-slug: deploying-php-fabric
-redirect:
- - talks/deploying-php-applications-with-fabric/
----
-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).
-
-My favourite deployment tool of late is [Fabric][1] – a Python based command line tool for running commands locally as well as on remote servers. It’s language and framework agnostic, and unopinionated so you define the steps and workflow that you need – from a basic few-step deployment to a full Capistrano style zero-downtime deployment.
-
-This talk will cover some introduction to Fabric and how to write your own fabfiles, and then look at some examples of different use case deployments for your PHP project.
-
-[1]: http://www.fabfile.org
diff --git a/source/_talks/drupal-8-module-development.md b/source/_talks/drupal-8-module-development.md
index bcd38eb9..8524366f 100644
--- a/source/_talks/drupal-8-module-development.md
+++ b/source/_talks/drupal-8-module-development.md
@@ -1,7 +1,5 @@
---
-id: drupal-8-module-development
title: Getting Started with Drupal 8 Module Development
-type: Talk
tags: [conference, php, drupal, drupalcamp, drupal-8]
tweets: yes
code: https://github.com/opdavies/dclondon16-d8-module
diff --git a/source/_talks/drupal-8-rejoining-the-herd.md b/source/_talks/drupal-8-rejoining-the-herd.md
index 9d4e8c3e..fee35376 100644
--- a/source/_talks/drupal-8-rejoining-the-herd.md
+++ b/source/_talks/drupal-8-rejoining-the-herd.md
@@ -1,7 +1,5 @@
---
-id: drupal-8-rejoining-the-herd
title: Drupal 8: Rejoining the Herd
-type: Talk
tags: [conference, php, drupal, drupal-8]
slides:
url: https://speakerdeck.com/opdavies/drupal-rejoining-the-herd
diff --git a/source/_talks/drupal-8.md b/source/_talks/drupal-8.md
index 3f18f715..ab02d5d6 100644
--- a/source/_talks/drupal-8.md
+++ b/source/_talks/drupal-8.md
@@ -1,5 +1,4 @@
---
-id: drupal-8
title: Drupal 8
type: Lightning talk
slides:
diff --git a/source/_talks/drupal-development-with-composer.md b/source/_talks/drupal-development-with-composer.md
index b0fb5ee0..32169ffe 100644
--- a/source/_talks/drupal-development-with-composer.md
+++ b/source/_talks/drupal-development-with-composer.md
@@ -1,5 +1,4 @@
---
-id: drupal-development-with-composer
title: Modern Drupal Development with Composer
type: Lightning talk
tags: ['meetups', 'phpsw', 'drupal', 'composer']
diff --git a/source/_talks/drupal-vm-generator.md b/source/_talks/drupal-vm-generator.md
index 02e00fc5..9867c58c 100644
--- a/source/_talks/drupal-vm-generator.md
+++ b/source/_talks/drupal-vm-generator.md
@@ -1,5 +1,4 @@
---
-id: drupal-vm-generator
title: Drupal VM Generator
type: Lightning talk
code: https://github.com/opdavies/drupal-vm-generator
diff --git a/source/_talks/drupal-vm-meet-symfony-console.md b/source/_talks/drupal-vm-meet-symfony-console.md
index 737543aa..51487342 100644
--- a/source/_talks/drupal-vm-meet-symfony-console.md
+++ b/source/_talks/drupal-vm-meet-symfony-console.md
@@ -1,7 +1,5 @@
---
-id: drupal-vm-meet-symfony-console
title: Drupal VM, Meet Symfony Console
-type: Talk
tags: [conference, php, drupal-vm, symfony]
slides:
url: https://speakerdeck.com/opdavies/drupal-vm-meet-symfony-console
diff --git a/source/_talks/drupalorg-2015.md b/source/_talks/drupalorg-2015.md
index 72ea6fef..a277fa45 100644
--- a/source/_talks/drupalorg-2015.md
+++ b/source/_talks/drupalorg-2015.md
@@ -1,7 +1,5 @@
---
-id: drupalorg-2015
title: Drupal.org in 2015: What's Coming Next
-type: Talk
tags: [conference, drupalcamp, drupalcamp-london, drupal-association]
slides:
url: https://speakerdeck.com/opdavies/drupal-dot-org-in-15
diff --git a/source/_talks/drush-make-drupalbristol.md b/source/_talks/drush-make-drupalbristol.md
index 30abc360..55f958aa 100644
--- a/source/_talks/drush-make-drupalbristol.md
+++ b/source/_talks/drush-make-drupalbristol.md
@@ -1,7 +1,5 @@
---
-id: drush-make-drupalbristol
title: drush make drupalbristol
-type: Talk
slides:
url: https://speakerdeck.com/opdavies/drush-make-drupalbristol
embed:
diff --git a/source/_talks/getting-your-data-into-drupal-8.md b/source/_talks/getting-your-data-into-drupal-8.md
index 5d7147d1..84f2f0b3 100644
--- a/source/_talks/getting-your-data-into-drupal-8.md
+++ b/source/_talks/getting-your-data-into-drupal-8.md
@@ -1,7 +1,5 @@
---
-id: getting-your-data-into-drupal-8
title: Getting (Your Data) Into Drupal 8
-type: Talk
slides:
url: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol
embed: ''
@@ -22,6 +20,7 @@ meta:
redirect:
- talks/2017/01/18/getting-your-data-into-drupal-8-drupal-bristol/
- talks/2017/03/04/getting-your-data-into-drupal-8-drupalcamp-london-2017/
+use: [talks]
---
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/git-flow.md b/source/_talks/git-flow.md
index c7c32159..15e844a5 100644
--- a/source/_talks/git-flow.md
+++ b/source/_talks/git-flow.md
@@ -1,7 +1,5 @@
---
-id: git-flow
title: Never Commit to Master - An Introduction to Git Flow
-type: Talk
slides:
url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow
embed:
diff --git a/source/_talks/goodbye-drush-make-hello-composer.md b/source/_talks/goodbye-drush-make-hello-composer.md
index d5124be3..27dd3dce 100644
--- a/source/_talks/goodbye-drush-make-hello-composer.md
+++ b/source/_talks/goodbye-drush-make-hello-composer.md
@@ -1,7 +1,5 @@
---
-id: goodbye-drush-make-hello-composer
title: Goodbye Drush Make. Hello Composer!
-type: Talk
tags: ['meetup', 'drupal', 'composer']
slides:
url: http://bit.ly/slides-goodbye-drush-make-hello-composer2
diff --git a/source/_talks/it-all-started-with-a-patch.md b/source/_talks/it-all-started-with-a-patch.md
index 9de10ea8..f73efbd4 100644
--- a/source/_talks/it-all-started-with-a-patch.md
+++ b/source/_talks/it-all-started-with-a-patch.md
@@ -1,5 +1,4 @@
---
-id: it-all-started-with-a-patch
title: It All Started With A Patch
type: Lightning talk
tags: [meetup, phpsw, open-source]
diff --git a/source/_talks/sculpin.md b/source/_talks/sculpin.md
index 7f380c48..fed58d57 100644
--- a/source/_talks/sculpin.md
+++ b/source/_talks/sculpin.md
@@ -1,5 +1,4 @@
---
-id: sculpin
title: Building Static Websites with Sculpin
type: Lightning talk
slides:
diff --git a/source/_talks/test-driven-drupal-simpletest-phpunit.md b/source/_talks/tdd-test-driven-drupal.md
similarity index 91%
rename from source/_talks/test-driven-drupal-simpletest-phpunit.md
rename to source/_talks/tdd-test-driven-drupal.md
index 8daabc00..aacd4541 100644
--- a/source/_talks/test-driven-drupal-simpletest-phpunit.md
+++ b/source/_talks/tdd-test-driven-drupal.md
@@ -1,6 +1,5 @@
---
-title: Test Driven Drupal Development with SimpleTest and PHPUnit
-type: Talk
+title: TDD - Test Driven Drupal
slides:
url: https://speakerdeck.com/opdavies/test-driven-drupal-development-with-simpletest-and-phpunit-drupalcamp-london-17
embed: ''
@@ -10,7 +9,7 @@ video:
tags: [drupalcamp, simpletest, phpunit, testing]
meta:
og:
- title: Test Driven Drupal Development with SimpleTest and PHPUnit
+ title: TDD - Test Driven Drupal
description: "How to write tests and follow TDD for Drupal applications."
type: website
image:
@@ -18,6 +17,9 @@ meta:
width: 2560
height: 1440
type: image/png
+redirect:
+ - /talks/test-driven-drupal-development-with-simpletest-and-phpunit/
+use: [talks]
---
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/test-drive-twig-with-sculpin.md b/source/_talks/test-drive-twig-with-sculpin.md
index b80400d1..d9c68b47 100644
--- a/source/_talks/test-drive-twig-with-sculpin.md
+++ b/source/_talks/test-drive-twig-with-sculpin.md
@@ -1,7 +1,5 @@
---
-id: test-drive-twig-with-sculpin
title: Test Drive Twig with Sculpin
-type: Talk
slides:
url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
embed:
diff --git a/source/_talks/what-is-this-drupal-thing.md b/source/_talks/what-is-this-drupal-thing.md
index a0c7aacb..268cfc7a 100644
--- a/source/_talks/what-is-this-drupal-thing.md
+++ b/source/_talks/what-is-this-drupal-thing.md
@@ -1,7 +1,5 @@
---
-id: what-is-this-drupal-thing
title: So, what is this Drupal thing?
-type: Talk
video:
url: https://vimeo.com/49827006
embed:
diff --git a/source/talks.md b/source/talks.md
index 6cc77b90..bbe1d8b9 100644
--- a/source/talks.md
+++ b/source/talks.md
@@ -21,14 +21,12 @@ There is also information about events that I’ve attended and spoken at on my
{% if date.date >= 'today'|date('Y-m-d') %}
{% set upcoming_events = upcoming_events|reverse|merge([{
date: date,
- event: site.events.events[date.event],
- talks: data.talks,
+ event: site.events.events[date.event]
}]) %}
{% else %}
{% set past_events = past_events|merge([{
date: date,
- event: site.events.events[date.event],
- talks: data.talks,
+ event: site.events.events[date.event]
}]) %}
{% endif %}
{% endfor %}
diff --git a/source/talks/archive.md b/source/talks/archive.md
index 77e03fd9..2e7be820 100644
--- a/source/talks/archive.md
+++ b/source/talks/archive.md
@@ -13,12 +13,11 @@ Here are a list of my previous conference and user group talks:
{% set events = events|merge([{
date: date,
event: site.events.events[date.event],
- talks: data.talks,
}]) %}
{% endif %}
{% endfor %}
-{% include 'talks-table' with { events: events } %}
+{% include 'talks-table' %}
Upcoming talks can be found on the [talks page][0].