parent
a89c270c84
commit
12aae75578
23 changed files with 199 additions and 126 deletions
|
|
@ -1,24 +0,0 @@
|
|||
<head>
|
||||
{% include 'title' %}
|
||||
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
{% if page.meta.description %}
|
||||
<meta name="description" content="{{ page.meta.description|e('html') }}">
|
||||
{% endif %}
|
||||
|
||||
{% include 'og' with { og: page.meta.og } %}
|
||||
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/site.css">
|
||||
{% block styles %}{% endblock %}
|
||||
|
||||
{% for size in site.apple_touch_icon_sizes %}
|
||||
<link rel="apple-touch-icon" href="{{ site.avatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
|
||||
{% endfor %}
|
||||
|
||||
{% for size in site.favicon_sizes %}
|
||||
<link rel="icon" href="{{ site.avatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
|
||||
{% endfor %}
|
||||
</head>
|
||||
|
|
@ -1,6 +1,29 @@
|
|||
<!DOCTYPE html>
|
||||
<html class="no-js" lang="en-GB">
|
||||
{% include 'head' %}
|
||||
<head>
|
||||
{% include 'title' %}
|
||||
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
{% if page.meta.description %}
|
||||
<meta name="description" content="{{ page.meta.description|e('html') }}">
|
||||
{% endif %}
|
||||
|
||||
{% include 'og' with { og: page.meta.og } %}
|
||||
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
|
||||
{% block stylesheets '' %}
|
||||
|
||||
{% for size in site.apple_touch_icon_sizes %}
|
||||
<link rel="apple-touch-icon" href="{{ site.avatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
|
||||
{% endfor %}
|
||||
|
||||
{% for size in site.favicon_sizes %}
|
||||
<link rel="icon" href="{{ site.avatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
|
||||
{% endfor %}
|
||||
</head>
|
||||
|
||||
<body class="{{ page.blocks.body_classes }}">
|
||||
{% include 'nav' %}
|
||||
|
|
@ -9,9 +32,7 @@
|
|||
<div class="row">
|
||||
<main class="col-md-9">
|
||||
{% block content_top %}{% endblock %}
|
||||
{% block content_wrapper %}
|
||||
{% block content %}{% endblock %}
|
||||
{% endblock %}
|
||||
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
|
||||
{% block content_bottom %}{% endblock %}
|
||||
</main>
|
||||
|
||||
|
|
@ -21,6 +42,6 @@
|
|||
|
||||
{% include 'footer' %}
|
||||
|
||||
{% block scripts %}{% endblock %}
|
||||
{% block scripts '' %}
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -11,3 +11,7 @@
|
|||
{% include 'post/pager' %}
|
||||
{% include 'post/about-author' %}
|
||||
{% endblock %}
|
||||
|
||||
{% block stylesheets %}
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/blog-post.css">
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -11,3 +11,7 @@
|
|||
{% include 'project/skills' %}
|
||||
{% include 'project/company' %}
|
||||
{% endblock %}
|
||||
|
||||
{% block stylesheets %}
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/project.css">
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -15,3 +15,8 @@
|
|||
{% include 'talk/video' %}
|
||||
{% include 'talk/events' %}
|
||||
{% endblock %}
|
||||
|
||||
{% block stylesheets %}
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/talk.css">
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/talks-table.css">
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -41,3 +41,7 @@ use: [posts]
|
|||
{% endblock %}
|
||||
|
||||
{% block body_classes 'page--blog page--blog__list' %}
|
||||
|
||||
{% block stylesheets %}
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/blog.css">
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -99,11 +99,17 @@ experiences:
|
|||
Maintaining and adding new features to the Horse & Country TV website (Drupal 6).
|
||||
use: [posts]
|
||||
---
|
||||
<h1>Experience</h1>
|
||||
{% block content %}
|
||||
<h1>Experience</h1>
|
||||
|
||||
{% 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 %}
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/experience.css">
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ tools:
|
|||
- { title: Ansible, website: http://www.ansible.com }
|
||||
use: [posts, testimonials]
|
||||
---
|
||||
{% block content %}
|
||||
# About Me
|
||||
|
||||
<img src="{{ site.images_url }}{{ site.avatar.url }}" alt="Picture of Oliver" class="me img-circle">
|
||||
|
|
@ -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 %}
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/about.css">
|
||||
{% endblock %}
|
||||
|
||||
[1]: https://www.google.com/#q=opdavies
|
||||
[2]: https://www.drupal.org
|
||||
|
|
|
|||
|
|
@ -5,40 +5,46 @@ meta:
|
|||
description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
|
||||
use: [talks, posts]
|
||||
---
|
||||
<h1>Talks</h1>
|
||||
{% block content %}
|
||||
<h1>Talks</h1>
|
||||
|
||||
<p>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 <a href="/contact/">get in touch</a>.</p>
|
||||
<p>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 <a href="/contact/">get in touch</a>.</p>
|
||||
|
||||
<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>
|
||||
<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 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 %}
|
||||
<h2>Upcoming Talks</h2>
|
||||
|
||||
{% if upcoming_events is not empty %}
|
||||
<h2>Upcoming Talks</h2>
|
||||
{% include "talks-table" with {
|
||||
events: upcoming_events|sortbyfield('date'),
|
||||
hide_feedback: true,
|
||||
} %}
|
||||
{% endif %}
|
||||
|
||||
<h2>Last 5 Talks</h2>
|
||||
|
||||
{% include "talks-table" with {
|
||||
events: upcoming_events|sortbyfield('date'),
|
||||
hide_feedback: true,
|
||||
events: past_events|sortbyfield('date')|reverse[:5]
|
||||
} %}
|
||||
{% endif %}
|
||||
|
||||
<h2>Last 5 Talks</h2>
|
||||
<p>You can view more talks in the <a href="/talks/archive">talks archive</a>.</p>
|
||||
{% endblock %}
|
||||
|
||||
{% include "talks-table" with {
|
||||
events: past_events|sortbyfield('date')|reverse[:5]
|
||||
} %}
|
||||
|
||||
<p>You can view more talks in the <a href="/talks/archive">talks archive</a>.</p>
|
||||
{% block stylesheets %}
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/talks-table.css">
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -89,3 +89,7 @@ use: [posts]
|
|||
{% endblock %}
|
||||
|
||||
{% block body_classes 'page--testimonials' %}
|
||||
|
||||
{% block stylesheets %}
|
||||
<link rel="stylesheet" href="{{ site.url }}/assets/css/testimonials.css">
|
||||
{% endblock %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue