Refactor events and talks

source/_views/talk.twig

@@ -33,12 +33,21 @@
         <h2>Events</h2>
 
         {% set events = [] %}
-        {% for event in page.events %}
-            {% set event = event|merge({ talk: page })|merge(site.events[event.id]) %}
-            {% set events = events|merge([event]) %}
+        {% for date in site.events.dates %}
+            {% set key = (date.talk.id is defined) ? date.talk.id : date.talk %}
+            {% set talk = (page.id is defined) ? page.id : page.url|split('/')|last %}
+            {% if key == talk %}
+                {% set events = events|merge([{
+                    date: date,
+                    event: site.events.events[date.event],
+                }]) %}
+            {% endif %}
         {% endfor %}
 
-        {% include "talks-table" with { events: events, hide_talk: true } %}
+        {% include 'talks-table' with {
+            events: events,
+            talk_page: true,
+        } %}
     </div>{# .talk-events #}
 {% endblock %}