Experience
+{% block content %} +Experience
-{% for experience in page.experiences %} - {% include "experience/item" with { - experience: experience, - company: site.companies[experience.company] - } %} -{% endfor %} + {% for experience in page.experiences %} + {% include "experience/item" with { + experience: experience, + company: site.companies[experience.company] + } %} + {% endfor %} +{% endblock %} + +{% block stylesheets %} + +{% endblock %} diff --git a/source/index.md b/source/index.md index 4d4e9a47..849dc780 100644 --- a/source/index.md +++ b/source/index.md @@ -18,6 +18,7 @@ tools: - { title: Ansible, website: http://www.ansible.com } use: [posts, testimonials] --- +{% block content %} # About Me
@@ -47,6 +48,11 @@ I’m a provisional member of the [Drupal Security team][14] and a webmaster and
- [Stack Overflow][37]
- [Disqus][38]
- IRC (freenode) - {{ site.irc.name }}
+{% endblock %}
+
+{% block stylesheets %}
+
+{% endblock %}
[1]: https://www.google.com/#q=opdavies
[2]: https://www.drupal.org
diff --git a/source/talks.twig b/source/talks.twig
index 879a401e..8b3aa44d 100644
--- a/source/talks.twig
+++ b/source/talks.twig
@@ -5,40 +5,46 @@ meta:
description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
use: [talks, posts]
---
-Talks
+{% block content %} +Talks
-I regularly speak at conferences and user groups about a range of subjects including Drupal, Sculpin and Git. If you would like to me to speak at your group or conference, please get in touch.
+I regularly speak at conferences and user groups about a range of subjects including Drupal, Sculpin and Git. If you would like to me to speak at your group or conference, please get in touch.
-There is also information about events that I’ve attended and spoken at on my Lanyrd and Joind.in profiles.
+There is also information about events that I’ve attended and spoken at on my Lanyrd and Joind.in profiles.
-{% set upcoming_events = [] %} -{% set past_events = [] %} + {% set upcoming_events = [] %} + {% set past_events = [] %} -{% for talk in data.talks %} - {% for event in talk.events if event.date >= 'today'|date('Y-m-d') %} - {% set event = event|merge({ talk: talk })|merge(site.events[event.id]) %} - {% set upcoming_events = upcoming_events|merge([event]) %} + {% for talk in data.talks %} + {% for event in talk.events if event.date >= 'today'|date('Y-m-d') %} + {% set event = event|merge({ talk: talk })|merge(site.events[event.id]) %} + {% set upcoming_events = upcoming_events|merge([event]) %} + {% endfor %} + + {% for event in talk.events if event.date < 'today'|date('Y-m-d') %} + {% set event = event|merge({ talk: talk })|merge(site.events[event.id]) %} + {% set past_events = past_events|merge([event]) %} + {% endfor %} {% endfor %} - {% for event in talk.events if event.date < 'today'|date('Y-m-d') %} - {% set event = event|merge({ talk: talk })|merge(site.events[event.id]) %} - {% set past_events = past_events|merge([event]) %} - {% endfor %} -{% endfor %} + {% if upcoming_events is not empty %} +Upcoming Talks
-{% if upcoming_events is not empty %} -Upcoming Talks
+ {% include "talks-table" with { + events: upcoming_events|sortbyfield('date'), + hide_feedback: true, + } %} + {% endif %} + +Last 5 Talks
{% include "talks-table" with { - events: upcoming_events|sortbyfield('date'), - hide_feedback: true, + events: past_events|sortbyfield('date')|reverse[:5] } %} -{% endif %} -Last 5 Talks
+You can view more talks in the talks archive.
+{% endblock %} -{% include "talks-table" with { - events: past_events|sortbyfield('date')|reverse[:5] -} %} - -You can view more talks in the talks archive.
+{% block stylesheets %} + +{% endblock %} diff --git a/source/testimonials.twig b/source/testimonials.twig index 20f51dab..3b975041 100644 --- a/source/testimonials.twig +++ b/source/testimonials.twig @@ -89,3 +89,7 @@ use: [posts] {% endblock %} {% block body_classes 'page--testimonials' %} + +{% block stylesheets %} + +{% endblock %}