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

Refactor talks to be a lot simpler

Browse source
This commit is contained in:
Oliver Davies 2018-02-13 08:45:57 +00:00
parent 42fd848581
commit 607f56e8c7
75 changed files with 390 additions and 980 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/_includes/talk/events.html.twig
View file

@ -1,8 +0,0 @@
<div class="mt-8">
<h2>Events</h2>
{% include "talks-table" with {
talks: getAllTalks([page], site.events),
talk_page: true
} %}
</div>

7
source/_includes/talk/slides.html.twig
View file

@ -1,9 +1,8 @@
{% if page.slides.embed %}
{% if page.speakerdeck.id and page.speakerdeck.ratio %}
<div class="mt-4">
<h2>Slides</h2>
<div class="talk-slides">
{{ page.slides.embed|raw }}
</div>
<noscript>**Please enable JavaScript to view slides.**</noscript>
<script async class="speakerdeck-embed" data-id="{{ page.speakerdeck.id }}" data-ratio="{{ page.speakerdeck.ratio }}" src="//speakerdeck.com/assets/embed.js"></script>
</div>
{% endif %}

24
source/_includes/talk/video.html.twig
View file

@ -1,9 +1,29 @@
{% if page.video.embed %}
{% if page.youtube.id or page.vimeo.id %}
<div class="mt-4">
<h2>Video</h2>
<div class="talk-video">
{{ page.video.embed|raw }}
{% if page.youtube.id %}
<iframe
width="678"
height="408"
src="//www.youtube.com/embed/{{ page.youtube.id }}"
frameborder="0"
allowfullscreen
>
</iframe>
{% elseif page.vimeo.id %}
<iframe
src="https://player.vimeo.com/video/{{ page.vimeo.id }}"
width="640"
height="360"
frameborder="0"
webkitallowfullscreen
mozallowfullscreen
allowfullscreen
>
</iframe>
{% endif %}
</div>
</div>
{% endif %}

59
source/_includes/talks-table-row.html.twig
View file

@ -1,59 +0,0 @@
<tr>
<td>
{{ row.event.date|date(row.event.fuzzy_date ? 'F Y' : 'j F Y') }}
{% if row.event.time is defined %}
<div class="text-xs text-grey-dark">
{{ row.event.time }}
</div>
{% endif %}
</td>
{% if not talk_page %}
<td>
{% if row.talk.url is not empty %}
<a href="{{ row.talk.url }}">
{{ row.talk.title }}
</a>
{% else %}
{{ row.talk.title }}
{% endif %}
<div class="text-xs text-grey-dark">
{% if row.talk.type %}
{{ row.talk.type }}
{% else %}
{{ row.event.type|default('Talk') }}
{% endif %}
</div>
</td>
{% endif %}
<td>
{% if row.event.website is not empty %}
<a href="{{ row.event.website }}">
{{ row.event.name }}
</a>
{% else %}
{{ row.event.name }}
{% endif %}
{% if row.event.location is defined %}
<div class="text-xs text-grey-dark">
{{ row.event.location }}
</div>
{% endif %}
</td>
{% if not upcoming %}
<td>
{% if row.event.feedback and row.event.date <= today %}
<a href="{{ row.event.feedback }}"
class="button"
title="Read or leave feedback for this talk">
<i class="fa fa-comment-o"></i> joind.in
</a>
{% endif %}
</td>
{% endif %}
</tr>

26
source/_includes/talks-table.html.twig
View file

@ -1,26 +0,0 @@
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th class="w-1/4">Date</th>
{% if not talk_page %}
<th class="w-1/3">Talk</th>
{% endif %}
<th>Event</th>
{% if not upcoming %}
<th>Feedback</th>
{% endif %}
</tr>
</thead>
<tbody>
{% for row in talks %}
{% include "talks-table-row" with {
today: 'today'|date('Y-m-d')
} %}
{% endfor %}
</tbody>
</table>
</div>