Show relevant events on talk pages

This commit is contained in:
Oliver Davies 2017-03-06 08:16:34 +00:00
parent dca643b7c1
commit 05a9d2efc2
4 changed files with 23 additions and 9 deletions

View file

@ -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>

View file

@ -2,22 +2,24 @@
<thead> <thead>
<tr> <tr>
<th>Date</th> <th>Date</th>
<th>Talk</th> {% if show_talk %}<th>Talk</th>{% endif %}
<th>Event</th> <th>Event</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for event in events %} {% for event in events|sortbyfield('date')|reverse %}
<tr> <tr>
<td> <td>
{{ event.date|date(site.default_date_format) }} {{ event.date|date('j F Y') }}
</td> </td>
<td> {% if show_talk %}
<a href="{{ event.talk.url }}"> <td>
{{ event.talk.title }} <a href="{{ event.talk.url }}">
</a> {{ event.talk.title }}
</td> </a>
</td>
{% endif %}
<td> <td>
{{ event.title }} {{ event.title }}

View file

@ -11,4 +11,5 @@
{% include 'talk/slides' %} {% include 'talk/slides' %}
{% include 'talk/video' %} {% include 'talk/video' %}
{% include 'talk/events' %}
{% endblock %} {% endblock %}

View file

@ -20,4 +20,4 @@ use: [talks, posts]
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% include "talks-table" with { events: events|sortbyfield('date')|reverse } %} {% include "talks-table" with { events: events, show_talk: true } %}