From fa36a2f61c0fd4ef5e813847ed77475a0ee71a67 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.co.uk>
Date: Fri, 10 Apr 2015 23:21:29 +0100
Subject: [PATCH] Replaced talks.md with talks.html.twig

---
 source/talks.html.twig | 76 +++++++++---------------------------------
 1 file changed, 16 insertions(+), 60 deletions(-)

diff --git a/source/talks.html.twig b/source/talks.html.twig
index f144f2ce..782f85a6 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -1,68 +1,10 @@
 ---
 layout: default
 title: Talks
-nav: talks
 meta:
   description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
-talks:
-  - date: 2012-09-05
-    location: unified.diff
-    description: <a href="http://vimeo.com/49827006">So, what is this Drupal thing?</a> - an introduction to Drupal.
-    tags:
-      - user-group
-      - drupal
-  - date: 2013-07-10
-    location: South Wales Drupal User Group
-    description: An overview of the Drupal LDAP module and how I customised it for a client project.
-    tags:
-      - user-group
-      - drupal
-      - ldap
-  - date: 2014-03-01
-    location: DrupalCamp London
-    description: <a href="/blog/what-git-flow">Never Commit to Master</a>: An Introduction to Git Flow.
-    tags:
-      - conference
-      - drupalcamp
-      - git
-      - git-flow
-  - date: 2014-07-02
-    location: Drupal Bristol User Group
-    description: <a href="/blog/drush-make-drupalbristol">drush make drupalbristol</a>: An introduction to Drush and Drush Make.
-    tags:
-      - user-group
-      - drush
-      - drush-make
-  - date: 2014-08-09
-    location: South Wales Drupal User Group
-    description: An impromptu talk about the <a href="https://assoc.drupal.org">Drupal Association</a> and I've done there since joining the team.
-    tags:
-      - user-group
-      - drupal-association
-  - date: 2015-01-18
-    location: DrupalCamp Brighton
-    description: Drupal.org in 2015: What's coming next?
-    tags:
-      - conference
-      - drupalcamp
-      - drupalorg
-      - drupal-association
-  - date: 2015-02-28
-    location: DrupalCamp London
-    description: Drupal.org in 2015: What's coming next?
-    tags:
-      - conference
-      - drupalcamp
-      - drupalorg
-      - drupal-association
-  - date: 2015-04-08
-    location: PHPSW
-    description: <a href="https://speakerdeck.com/opdavies/drupal-8">Drupal 8</a> (lightning talk)
-    tags:
-      - user-group
-      - drupal
-      - drupal-8
-      - phpsw
+use:
+  - talks
 ---
 <h1>Talks</h1>
 
@@ -98,3 +40,17 @@ talks:
 {% if found %}
   </dl>
 {% endif %}
+=======
+use:
+  - talks
+---
+
+<h1>Talks</h1>
+
+<dl>
+  {% for talk in data.talks %}
+    <dt>{{ talk.date|date('F Y') }} - {{ talk.location|raw }}</dt>
+    <dd><a href="{{ site.url }}{{ talk.url }}">{{ talk.title }}</a></dd>
+  {% endfor %}
+</dl>
+>>>>>>> Replaced talks.md with talks.html.twig