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

Update partials

Browse source
This commit is contained in:
Oliver Davies 2016-09-01 08:00:21 +01:00
parent fbbe3276e7
commit 9bd39e9692
19 changed files with 129 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

9
source/_partials/badges.html.twig Normal file
View file

@ -0,0 +1,9 @@
<div class="panel badges">
<a class="badges__badge--da-member" href="https://assoc.drupal.org/membership" title="I’m a Drupal Association member.">
<img src="{{ site.images_url }}/assets/images/da-individual-member.png" alt="Drupal Association Individual Member">
</a>
<a href="https://www.drupal.org/8">
<img alt="I built Drupal 8 with hand holding a wrench on blue background" src="{{ site.images_url }}/assets/images/drupal-8.jpg"/>
</a>
</div>

7
source/_partials/post/about-author.html.twig Normal file
View file

@ -0,0 +1,7 @@
<div class="about-author">
<h2>About the Author</h2>
<img src="{{ site.gravatar.url }}?s=100" alt="Picture of Oliver" class="img-circle">
<p>{{ site.author.bio|raw }}</p>
</div>

3
source/_partials/post/feedback.html.twig Normal file
View file

@ -0,0 +1,3 @@
<p class="post-feedback" style="font-style: italic">
<b>Have feedback on this post?</b> <a href="mailto:{{ site.email }}?subject=Feedback: {{ page.title }}">Email me</a> or <a href="https://twitter.com/intent/tweet?text=@{{ site.twitter.name }}&url={{ site.url }}{{ page.url|url_encode }}">send me a tweet</a>.
</p>

6
source/_partials/post/pager.html.twig Normal file
View file

@ -0,0 +1,6 @@
{% if page.next_post or page.previous_post %}
<ul>
{% if page.next_post %}<li>Next post: <a href="{{ page.next_post.url }}">{{ page.next_post.title }}</a></li>{% endif %}
{% if page.previous_post %}<li>Previous post: <a href="{{ page.previous_post.url }}">{{ page.previous_post.title }}</a></li>{% endif %}
</ul>
{% endif %}

11
source/_partials/post/related.html.twig Normal file
View file

@ -0,0 +1,11 @@
{% if page.related -%}
<h2>Related Posts</h2>
<ul>
{% for relate in page.related -%}
<li>
<a href="{{ relate.source.url }}">{{ relate.title }}</a>
</li>
{% endfor %}
</ul>
{%- endif %}

8
source/_partials/post/tags.html.twig Normal file
View file

@ -0,0 +1,8 @@
{% if page.tags %}
<p class="tags">
Tags:
{% for tag in page.tags %}
<a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
</p>
{% endif %}

32
source/_partials/posts/latest.html.twig
View file

@ -1,16 +1,18 @@
<div class="latest-posts">
<div class="latest-posts__heading">Latest blog posts</div>
{% if page.url == '/.' %}
<div class="latest-posts">
<div class="latest-posts__heading">Latest blog posts</div>
<ul>
{% for post in data.posts|slice(0, site.latest_posts) %}
<li class="post">
<span class="post__title">
<a href="{{ post.url }}">
{{ post.title }}
</a>
</span> -
<span class="post__date">{{ post.date|date(site.default_date_format) }}</span>
</li>
{% endfor %}
</ul>
</div>
<ul>
{% for post in data.posts|slice(0, site.latest_posts) %}
<li class="post">
<span class="post__title">
<a href="{{ post.url }}">
{{ post.title }}
</a>
</span> -
<span class="post__date">{{ post.date|date(site.default_date_format) }}</span>
</li>
{% endfor %}
</ul>
</div>
{% endif %}

0
source/_partials/projects/company.html.twig → source/_partials/project/company.html.twig
View file

3
source/_partials/project/image.html.twig Normal file
View file

@ -0,0 +1,3 @@
{% if page.image -%}
<img src="/assets/images/projects/{{ page.image.name ?: page.image }}" alt="{{ page.image.alt }}">
{%- endif %}

0
source/_partials/projects/skills.html.twig → source/_partials/project/skills.html.twig
View file

5
source/_partials/project/website.html.twig Normal file
View file

@ -0,0 +1,5 @@
{% if page.website %}
<a class="project__website" href="{{ page.website }}">
View the website
</a>
{% endif %}

18
source/_partials/sidebar.html.twig
View file

@ -1,21 +1,9 @@
{% block sidebar_wrapper %}
<div class="col-md-3">
{% block sidebar %}
<div class="panel badges">
<a class="badges__badge--da-member" href="https://assoc.drupal.org/membership" title="I’m a Drupal Association member.">
<img src="{{ site.images_url }}/assets/images/da-individual-member.png" alt="Drupal Association Individual Member">
</a>
<a href="https://www.drupal.org/8">
<img alt="I built Drupal 8 with hand holding a wrench on blue background" src="{{ site.images_url }}/assets/images/drupal-8.jpg"/>
</a>
</div>
{% include('availability') %}
{% if page.url == '/.' %}
{% include ('posts/latest') %}
{% endif %}
{{ include('badges') }}
{{ include('availability') }}
{{ include('posts/latest') }}
{% endblock %}
</div>
{% endblock %}

14
source/_partials/talk/event.html.twig Normal file
View file

@ -0,0 +1,14 @@
{% if page.event %}
<h2>Details</h2>
<ul>
<li>
Event:
{% if page.event.website %}<a href="{{ page.event.website }}">{%- endif -%}
{{ page.event.name }}
{%- if page.event.website -%}</a>{%- endif %}
</li>
<li>Date: {{ page.date|date(site.default_date_format) }}</li>
<li>Location: {{ page.event.location }}</li>
</ul>
{% endif %}

9
source/_partials/talk/slides.html.twig Normal file
View file

@ -0,0 +1,9 @@
{% if page.slides.embed %}
<div class="slides">
<h2 class="slides__title">Slides</h2>
<div class="slides__content">
{{ page.slides.embed|raw }}
</div>
</div>
{% endif %}

7
source/_partials/talk/video.html.twig Normal file
View file

@ -0,0 +1,7 @@
{% if page.video.embed %}
<h2>Video</h2>
<div class="embed-container">
{{ page.video.embed|raw }}
</div>
{% endif %}

46
source/_views/post.html.twig
View file

@ -1,47 +1,13 @@
{% extends 'default' %}
{% block content_wrapper %}
{% include('post/header') %}
{{ include('post/header') }}
{% block content %}{% endblock %}
<p class="post-feedback" style="font-style: italic">
<b>Have feedback on this post?</b> <a href="mailto:{{ site.email }}?subject=Feedback: {{ page.title }}">Email me</a> or <a href="https://twitter.com/intent/tweet?text=@{{ site.twitter.name }}&url={{ site.url }}{{ page.url|url_encode }}">send me a tweet</a>.
</p>
{% if page.related -%}
<h2>Related Posts</h2>
<ul>
{% for relate in page.related -%}
<li>
<a href="{{ relate.source.url }}">{{ relate.title }}</a>
</li>
{% endfor %}
</ul>
{%- endif %}
{% if page.tags %}
<p class="tags">
Tags:
{% for tag in page.tags %}
<a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
{% endfor %}
</p>
{% endif %}
<div class="about-author">
<h2>About the Author</h2>
<img src="{{ site.gravatar.url }}?s=100" alt="Picture of Oliver" class="img-circle">
<p>{{ site.author.bio|raw }}</p>
</div>
{% if page.next_post or page.previous_post %}
<ul>
{% if page.next_post %}<li>Next post: <a href="{{ page.next_post.url }}">{{ page.next_post.title }}</a></li>{% endif %}
{% if page.previous_post %}<li>Previous post: <a href="{{ page.previous_post.url }}">{{ page.previous_post.title }}</a></li>{% endif %}
</ul>
{% endif %}
{{ include('post/feedback') }}
{{ include('post/related') }}
{{ include('post/tags') }}
{{ include('post/about-author') }}
{{ include('post/pager') }}
{% endblock %}

15
source/_views/project.html.twig
View file

@ -3,18 +3,11 @@
{% block body_classes 'page--project' %}
{% block content_wrapper %}
{% if page.image -%}
<img src="/assets/images/projects/{{ page.image.name ?: page.image }}" alt="{{ page.image.alt }}">
{%- endif %}
{{ include('project/image') }}
{% block content %}{% endblock %}
{% if page.website %}
<a class="project__website" href="{{ page.website }}">
View the website
</a>
{% endif %}
{{ include('projects/skills') }}
{{ include('projects/company') }}
{{ include('project/website') }}
{{ include('project/skills') }}
{{ include('project/company') }}
{% endblock %}

35
source/_views/talk.html.twig
View file

@ -7,36 +7,7 @@
{% block content_wrapper %}
{% block content %}{% endblock %}
{% if page.event %}
<h2>Details</h2>
<ul>
<li>
Event:
{% if page.event.website %}<a href="{{ page.event.website }}">{%- endif -%}
{{ page.event.name }}
{%- if page.event.website -%}</a>{%- endif %}
</li>
<li>Date: {{ page.date|date(site.default_date_format) }}</li>
<li>Location: {{ page.event.location }}</li>
</ul>
{% endif %}
{% if page.slides.embed %}
<div class="slides">
<h2 class="slides__title">Slides</h2>
<div class="slides__content">
{{ page.slides.embed|raw }}
</div>
</div>
{% endif %}
{% if page.video.embed %}
<h2>Video</h2>
<div class="embed-container">
{{ page.video.embed|raw }}
</div>
{% endif %}
{{ include('talk/event') }}
{{ include('talk/slides') }}
{{ include('talk/video') }}
{% endblock %}

25
source/blog.html
View file

@ -11,19 +11,22 @@ use:
<h1>Blog</h1>
<ul class="posts">
{% for post in page.pagination.items %}
<li class="post">
{% include 'post-header' with { page: post, title_tag: 'h2' } %}
{% for post in page.pagination.items %}
<li class="post">
{{ include('post/header', {
page: post,
title_tag: 'h2'
}) }}
{% if post.blocks.excerpt %}
{{ post.blocks.excerpt|raw }}
{% else %}
<p>{{ post.blocks.content|raw|striptags|split(' ')|slice(0,50)|join(' ')|replace({ 'h2':'h3' }) }} &hellip;</p>
{% endif %}
{% if post.blocks.excerpt %}
{{ post.blocks.excerpt|raw }}
{% else %}
<p>{{ post.blocks.content|raw|striptags|split(' ')|slice(0,50)|join(' ')|replace({ 'h2':'h3' }) }} &hellip;</p>
{% endif %}
<a href="{{ post.url }}">Read more &rarr;</a>
</li>
{% endfor %}
<a href="{{ post.url }}">Read more &rarr;</a>
</li>
{% endfor %}
</ul>
{% if page.pagination.previous_page or page.pagination.next_page %}