opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use a table for talks listing

Browse source
This commit is contained in:
Oliver Davies 2016-10-27 07:08:45 +01:00
parent 613c5f11a6
commit e32d9b2925
3 changed files with 51 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/_partials/talks-table.html.twig Normal file
View file

@ -0,0 +1,26 @@
<table class="table table-striped">
<thead>
<tr>
<th>Date</th>
<th>Talk</th>
<th>Event</th>
</tr>
</thead>
<tbody>
{% for talk in talks %}
<tr>
<td>
{{ talk.date|date(site.default_date_format) }}
</td>
<td>
<a href="{{ talk.url }}">
{{ talk.title }}
</a>
</td>
<td>{{ talk.event.name }}</td>
</tr>
{% endfor %}
</tbody>
</table>

8
source/_partials/talks/listing-item.html.twig
View file

@ -1,8 +0,0 @@
<li>
{{ talk.event.name }} -
{% if talk.fuzzy_date %}
{{ talk.title }}
{% else %}
<a href="{{ talk.url }}">{{ talk.title }}</a>
{% endif %}
</li>

70
source/talks.html.twig
View file

@ -12,53 +12,33 @@ use:
<p>There is also information about events that I’ve attended and spoken at on my <a href="{{ site.lanyrd.url }}">Lanyrd</a> and <a href="{{ site.joindin.url }}">Joind.in</a> profiles.</p>
{% set found = false %}
{% set year = 0 %}
{% set now = 'now'|date('U') %}
{% for talk in data.talks|reverse if talk.date >= now %}
{% if loop.first %}
{% set found = true %}
{% include "talks-table" with { talks: data.talks } %}
<h2>Upcoming Talks</h2>
{% endif %}
<!-- <table class="table table-striped">
<thead>
<tr>
<th>Date</th>
<th>Talk</th>
<th>Event</th>
</tr>
</thead>
<tbody>
{% for talk in data.talks if talk.date < now %}
<tr>
<td>
{{ talk.date|date(site.default_date_format) }}
</td>
{% if talk.date|date('Y') != year %}
{% set year = talk.date|date('Y') %}
<td>
<a href="{{ talk.url }}">
{{ talk.title }}
</a>
</td>
</ul>
<h3>{{ year }}</h3>
<ul>
{% endif %}
{{ include('talks/listing-item') }}
{% endfor %}
{% if found %}
</ul>
{% endif %}
{% set found = false %}
{% set year = 0 %}
{% for talk in data.talks if talk.date < now %}
{% if loop.first %}
{% set found = true %}
<h2>Previous Talks</h2>
{% endif %}
{% if talk.date|date('Y') != year %}
{% set year = talk.date|date('Y') %}
</ul>
<h3>{{ year }}</h3>
<ul>
{% endif %}
{{ include('talks/listing-item') }}
{% endfor %}
{% if found %}
</ul>
{% endif %}
<td>{{ talk.event.name }}</td>
</tr>
{% endfor %}
</tbody>
</table> -->