Add Drupal Bristol workshop

source/talks-archive.html.twig

@@ -3,16 +3,11 @@ layout: page
 title: Talk Archive
 permalink: talks/archive
 use: [talks]
-talks:
-    - title: 'Drupal and the LDAP module'
-      events:
-          - { date: '2013-07-10', event: swdug }
-    - title: 'About the Drupal Association'
-      events:
-          - { date: '2014-08-19', event: swdug }
 ---
 <p>Here are a list of my previous conference and user group talks:</p>
 
-{% include "talks-table" with { talks: getPastTalks(data.talks, site.events) } %}
+{% include "talks-table" with {
+    talks: getPastTalks(data.talks|merge(site.talks), site.events),
+} %}
 
 <p>Upcoming talks can be found on the <a href="{{ site.url }}/talks" class="link">talks page</a>.</p>

source/talks.html.twig

@@ -11,9 +11,12 @@ use: [talks]
     <div>
         <h2>Upcoming Talks</h2>
 
-        {% set upcoming_talks = getUpcomingTalks(data.talks, site.events) %}
+        {% set upcoming_talks = getUpcomingTalks(data.talks|merge(site.talks), site.events) %}
         {% if not upcoming_talks.empty %}
-            {% include "talks-table" with { talks: upcoming_talks, upcoming: true } %}
+            {% include "talks-table" with {
+                talks: upcoming_talks,
+                upcoming: true,
+            } %}
         {% else %}
             <p>Nothing scheduled at the moment.</p>
         {% endif %}
@@ -22,7 +25,9 @@ use: [talks]
     <div>
         <h2>Last 5 Talks</h2>
 
-        {% include "talks-table" with { talks: getPastTalks(data.talks, site.events)|slice(0,5) } %}
+        {% include "talks-table" with {
+            talks: getPastTalks(data.talks|merge(site.talks), site.events)|slice(0,5),
+        } %}
 
         <p>All previous talks can be found in the <a href="/talks/archive" class="link">talks archive</a>.</p>
     </div>