From e0e93e4fe535cb5be4dfb7bf2d9c4b2d2e0d3fca Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 27 Oct 2017 22:55:09 +0100 Subject: [PATCH] Re-add pseudo talks --- source/_includes/talks-table-row.html.twig | 10 +++++++--- source/talks/archive.html.twig | 11 ++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/source/_includes/talks-table-row.html.twig b/source/_includes/talks-table-row.html.twig index 793dabb1..9eac5be3 100644 --- a/source/_includes/talks-table-row.html.twig +++ b/source/_includes/talks-table-row.html.twig @@ -11,9 +11,13 @@ {% if not talk_page %} - - {{ row.talk.title }} - + {% if row.talk.url is not empty %} + + {{ row.talk.title }} + + {% else %} + {{ row.talk.title }} + {% endif %} {{ row.event.type|default('Talk') }} diff --git a/source/talks/archive.html.twig b/source/talks/archive.html.twig index e4aad707..e07c9a54 100644 --- a/source/talks/archive.html.twig +++ b/source/talks/archive.html.twig @@ -2,11 +2,20 @@ layout: page title: Talk 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 ---

Here are a list of my previous conference and user group talks:

{% set talks = [] %} -{% for talk in data.talks %} +{% for talk in data.talks|merge(page.talks) %} {% for event in talk.events %} {% set talks = talks|merge([{ event: event|merge(site.events[event.event]),