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

Standardise on include format

Browse source
This commit is contained in:
Oliver Davies 2016-09-29 12:43:17 +01:00
parent c5e5ae90d5
commit 188a8d044f
7 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/_partials/footer.html.twig
View file

@ -1,7 +1,7 @@
<footer class="container"> <footer class="container">
<p class="copyright">&copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}. Powered by <a href="https://sculpin.io">Sculpin</a>.</p> <p class="copyright">&copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}. Powered by <a href="https://sculpin.io">Sculpin</a>.</p>
{% include('meetups') %} {% include 'meetups' %}
</footer> </footer>
<script src="{{ site.url }}/assets/js/site.js"></script> <script src="{{ site.url }}/assets/js/site.js"></script>

4
source/_partials/head.html.twig
View file

@ -1,5 +1,5 @@
<head> <head>
{% include('title') %} {% include 'title' %}
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -10,7 +10,7 @@
{% endif %} {% endif %}
{% if page.meta.og %} {% if page.meta.og %}
{{ include('og', { og: page.meta.og }) }} {% include 'og' with { og: page.meta.og } %}
{% endif %} {% endif %}
<link rel="stylesheet" href="{{ site.url }}/assets/css/site.css"> <link rel="stylesheet" href="{{ site.url }}/assets/css/site.css">

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

@ -1,9 +1,9 @@
{% block sidebar_wrapper %} {% block sidebar_wrapper %}
<div class="col-md-3"> <div class="col-md-3">
{% block sidebar %} {% block sidebar %}
{{ include('badges') }} {% include 'badges' %}
{{ include('availability') }} {% include 'availability' %}
{{ include('posts/latest') }} {% include 'posts/latest' %}
{% endblock %} {% endblock %}
</div> </div>
{% endblock %} {% endblock %}

9
source/_views/default.html.twig
View file

@ -1,8 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html class="no-js" lang="en-GB"> <html class="no-js" lang="en-GB">
{{ include('head') }} {% include 'head' %}
<body class="{{ page.blocks.body_classes }}"> <body class="{{ page.blocks.body_classes }}">
{{ include('nav') }} {% include 'nav' %}
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -14,10 +15,10 @@
{% block content_bottom %}{% endblock %} {% block content_bottom %}{% endblock %}
</main> </main>
{{ include('sidebar') }} {% include 'sidebar' %}
</div>{# .row #} </div>{# .row #}
</div>{# .container #} </div>{# .container #}
{{ include('footer') }} {% include 'footer' %}
</body> </body>
</html> </html>

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

@ -1,13 +1,13 @@
{% extends 'default' %} {% extends 'default' %}
{% block content_wrapper %} {% block content_wrapper %}
{{ include('post/header') }} {% include 'post/header' %}
{% block content %}{% endblock %} {% block content %}{% endblock %}
{{ include('post/feedback') }} {% include 'post/feedback' %}
{{ include('post/related') }} {% include 'post/related' %}
{{ include('post/tags') }} {% include 'post/tags' %}
{{ include('post/about-author') }} {% include 'post/about-author' %}
{{ include('post/pager') }} {% include 'post/pager' %}
{% endblock %} {% endblock %}

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

@ -3,11 +3,11 @@
{% block body_classes 'page--project' %} {% block body_classes 'page--project' %}
{% block content_wrapper %} {% block content_wrapper %}
{{ include('project/image') }} {% include 'project/image' %}
{% block content %}{% endblock %} {% block content %}{% endblock %}
{{ include('project/website') }} {% include 'project/website' %}
{{ include('project/skills') }} {% include 'project/skills' %}
{{ include('project/company') }} {% include 'project/company' %}
{% endblock %} {% endblock %}

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

@ -7,7 +7,7 @@
{% block content_wrapper %} {% block content_wrapper %}
{% block content %}{% endblock %} {% block content %}{% endblock %}
{{ include('talk/event') }} {% include 'talk/event' %}
{{ include('talk/slides') }} {% include 'talk/slides' %}
{{ include('talk/video') }} {% include 'talk/video' %}
{% endblock %} {% endblock %}