diff --git a/source/_partials/talks-table.twig b/source/_partials/talks-table.twig index b4dd2d8a..a8bbab0a 100644 --- a/source/_partials/talks-table.twig +++ b/source/_partials/talks-table.twig @@ -3,10 +3,13 @@ Date + {% if not talk_page %} Talk {% endif %} + Event + {% if not upcoming %} Feedback {% endif %} @@ -16,12 +19,14 @@ {% for row in events %} {% set talk = false %} {% set key = row.date.talk.id ?: row.date.talk %} + {% for item in row.talks if key == item.filename|split('.')|first %} {% set talk = item %} {% endfor %} {{ row.date.date|date(row.date.fuzzy_date ? 'F Y' : 'j F Y') }} + {% if row.date.time %} {{ row.date.time }} {% endif %} @@ -34,6 +39,7 @@ {% else %} {{ talk.title }} {% endif %} + {{ row.date.talk.type ?: talk.type }} @@ -48,6 +54,7 @@ {% else %} {{ row.event.name }} {% endif %} + {{ row.event.location }} @@ -62,6 +69,7 @@ {% endif %} {% endif %} + {% endfor %} diff --git a/source/talks/archive.md b/source/talks/archive.md index bdfc1b26..77e03fd9 100644 --- a/source/talks/archive.md +++ b/source/talks/archive.md @@ -6,6 +6,7 @@ use: [talks] Here are a list of my previous conference and user group talks: {% set events = [] %} + {% for date in site.events.dates|reverse %} {% if date.date >= 'today'|date('Y-m-d') %} {% else %} @@ -16,6 +17,7 @@ Here are a list of my previous conference and user group talks: }]) %} {% endif %} {% endfor %} + {% include 'talks-table' with { events: events } %} Upcoming talks can be found on the [talks page][0].