From 188a8d044f32fafcac5f132fdff021698fab3cf0 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 29 Sep 2016 12:43:17 +0100 Subject: [PATCH] Standardise on include format --- source/_partials/footer.html.twig | 2 +- source/_partials/head.html.twig | 4 ++-- source/_partials/sidebar.html.twig | 6 +++--- source/_views/default.html.twig | 9 +++++---- source/_views/post.html.twig | 12 ++++++------ source/_views/project.html.twig | 8 ++++---- source/_views/talk.html.twig | 6 +++--- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/source/_partials/footer.html.twig b/source/_partials/footer.html.twig index f92cc00d..a702be68 100644 --- a/source/_partials/footer.html.twig +++ b/source/_partials/footer.html.twig @@ -1,7 +1,7 @@ diff --git a/source/_partials/head.html.twig b/source/_partials/head.html.twig index 448dce2a..c6c93ee5 100644 --- a/source/_partials/head.html.twig +++ b/source/_partials/head.html.twig @@ -1,5 +1,5 @@ - {% include('title') %} + {% include 'title' %} @@ -10,7 +10,7 @@ {% endif %} {% if page.meta.og %} - {{ include('og', { og: page.meta.og }) }} + {% include 'og' with { og: page.meta.og } %} {% endif %} diff --git a/source/_partials/sidebar.html.twig b/source/_partials/sidebar.html.twig index cfde2fca..d11fd725 100644 --- a/source/_partials/sidebar.html.twig +++ b/source/_partials/sidebar.html.twig @@ -1,9 +1,9 @@ {% block sidebar_wrapper %}
{% block sidebar %} - {{ include('badges') }} - {{ include('availability') }} - {{ include('posts/latest') }} + {% include 'badges' %} + {% include 'availability' %} + {% include 'posts/latest' %} {% endblock %}
{% endblock %} diff --git a/source/_views/default.html.twig b/source/_views/default.html.twig index 4b7c1fde..bc107c0e 100644 --- a/source/_views/default.html.twig +++ b/source/_views/default.html.twig @@ -1,8 +1,9 @@ - {{ include('head') }} + {% include 'head' %} + - {{ include('nav') }} + {% include 'nav' %}
@@ -14,10 +15,10 @@ {% block content_bottom %}{% endblock %} - {{ include('sidebar') }} + {% include 'sidebar' %}
{# .row #}
{# .container #} - {{ include('footer') }} + {% include 'footer' %} diff --git a/source/_views/post.html.twig b/source/_views/post.html.twig index 2385de40..ccfde6d6 100644 --- a/source/_views/post.html.twig +++ b/source/_views/post.html.twig @@ -1,13 +1,13 @@ {% extends 'default' %} {% block content_wrapper %} - {{ include('post/header') }} + {% include 'post/header' %} {% block content %}{% endblock %} - {{ include('post/feedback') }} - {{ include('post/related') }} - {{ include('post/tags') }} - {{ include('post/about-author') }} - {{ include('post/pager') }} + {% include 'post/feedback' %} + {% include 'post/related' %} + {% include 'post/tags' %} + {% include 'post/about-author' %} + {% include 'post/pager' %} {% endblock %} diff --git a/source/_views/project.html.twig b/source/_views/project.html.twig index a5228201..87e6a135 100644 --- a/source/_views/project.html.twig +++ b/source/_views/project.html.twig @@ -3,11 +3,11 @@ {% block body_classes 'page--project' %} {% block content_wrapper %} - {{ include('project/image') }} + {% include 'project/image' %} {% block content %}{% endblock %} - {{ include('project/website') }} - {{ include('project/skills') }} - {{ include('project/company') }} + {% include 'project/website' %} + {% include 'project/skills' %} + {% include 'project/company' %} {% endblock %} diff --git a/source/_views/talk.html.twig b/source/_views/talk.html.twig index 06ba181d..fbaa11d9 100644 --- a/source/_views/talk.html.twig +++ b/source/_views/talk.html.twig @@ -7,7 +7,7 @@ {% block content_wrapper %} {% block content %}{% endblock %} - {{ include('talk/event') }} - {{ include('talk/slides') }} - {{ include('talk/video') }} + {% include 'talk/event' %} + {% include 'talk/slides' %} + {% include 'talk/video' %} {% endblock %}