From 8cc4fecd28a5308a2323660fe1a0bf369baf4e70 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 5 Jun 2018 08:54:26 +0100
Subject: [PATCH] Add Drupal Bristol workshop

---
 app/config/sculpin_site.yml    |  3 +++
 data/talks.yml                 | 15 +++++++++++++++
 source/talks-archive.html.twig | 11 +++--------
 source/talks.html.twig         | 11 ++++++++---
 4 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 data/talks.yml

diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index 22f93dd7..ae85c057 100644
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@@ -228,3 +228,6 @@ youtube:
 work:
     role: Senior Developer
     company: microserve
+
+imports:
+    - '../../data/talks.yml'
diff --git a/data/talks.yml b/data/talks.yml
new file mode 100644
index 00000000..e2676685
--- /dev/null
+++ b/data/talks.yml
@@ -0,0 +1,15 @@
+# Any additional talks or workshops that need to be displayed on the talks
+# pages, but do not require their own pages.
+talks:
+    - title: 'Drupal and the LDAP module'
+      events:
+          - { event: swdug, date: '2013-07-10' }
+
+    - title: 'About the Drupal Association'
+      events:
+          - { event: swdug, date: '2014-08-19' }
+
+    - title: 'Automated testing with Drupal 8 and PHPUnit'
+      type: Workshop
+      events:
+            - { event: 'drupal-bristol', date: '2018-06-20' }
diff --git a/source/talks-archive.html.twig b/source/talks-archive.html.twig
index a3df9e7b..1ee395d2 100644
--- a/source/talks-archive.html.twig
+++ b/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>
diff --git a/source/talks.html.twig b/source/talks.html.twig
index 5c885ee7..d75fd789 100644
--- a/source/talks.html.twig
+++ b/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>