From 05a9d2efc2a097c180fa4e702afdb1ae708830ec Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 6 Mar 2017 08:16:34 +0000
Subject: [PATCH] Show relevant events on talk pages

---
 source/_partials/talk/events.twig | 11 +++++++++++
 source/_partials/talks-table.twig | 18 ++++++++++--------
 source/_views/talk.twig           |  1 +
 source/talks.html.twig            |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 source/_partials/talk/events.twig

diff --git a/source/_partials/talk/events.twig b/source/_partials/talk/events.twig
new file mode 100644
index 00000000..ac40e7fe
--- /dev/null
+++ b/source/_partials/talk/events.twig
@@ -0,0 +1,11 @@
+<div class="talk-events">
+    <h2>Events</h2>
+
+    {% set events = [] %}
+    {% for event in page.events %}
+        {% set event = event|merge({ talk: page })|merge(site.talks_events[event.id]) %}
+        {% set events = events|merge([event]) %}
+    {% endfor %}
+
+    {% include "talks-table" with { events: events } %}
+</div>
diff --git a/source/_partials/talks-table.twig b/source/_partials/talks-table.twig
index 56e6f9bc..4297a477 100644
--- a/source/_partials/talks-table.twig
+++ b/source/_partials/talks-table.twig
@@ -2,22 +2,24 @@
     <thead>
         <tr>
             <th>Date</th>
-            <th>Talk</th>
+            {% if show_talk %}<th>Talk</th>{% endif %}
             <th>Event</th>
         </tr>
     </thead>
     <tbody>
-        {% for event in events %}
+        {% for event in events|sortbyfield('date')|reverse %}
             <tr>
                 <td>
-                    {{ event.date|date(site.default_date_format) }}
+                    {{ event.date|date('j F Y') }}
                 </td>
 
-                <td>
-                    <a href="{{ event.talk.url }}">
-                        {{ event.talk.title }}
-                    </a>
-                </td>
+                {% if show_talk %}
+                    <td>
+                        <a href="{{ event.talk.url }}">
+                            {{ event.talk.title }}
+                        </a>
+                    </td>
+                {% endif %}
 
                 <td>
                     {{ event.title }}
diff --git a/source/_views/talk.twig b/source/_views/talk.twig
index b2af49ff..ac69104c 100644
--- a/source/_views/talk.twig
+++ b/source/_views/talk.twig
@@ -11,4 +11,5 @@
 
     {% include 'talk/slides' %}
     {% include 'talk/video' %}
+    {% include 'talk/events' %}
 {% endblock %}
diff --git a/source/talks.html.twig b/source/talks.html.twig
index 3b3d1e43..5950845a 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -20,4 +20,4 @@ use: [talks, posts]
     {% endfor %}
 {% endfor %}
 
-{% include "talks-table" with { events: events|sortbyfield('date')|reverse } %}
+{% include "talks-table" with { events: events, show_talk: true } %}