Template tidy

This commit is contained in:
Oliver Davies 2015-08-20 21:56:18 +01:00
parent d106acf639
commit 1cb1a628a0
14 changed files with 135 additions and 152 deletions

View file

@ -1,29 +1,25 @@
<!DOCTYPE html>
<!--[if lte IE 8]> <html class="ie ie8 lt9 lte8 lte7"> <![endif]-->
<!--[if IE 9]> <html class="ie ie9 lte9"> <![endif]-->
<!--[if gt IE 9]> <html> <![endif]-->
<!--[if !IE]><!--> <html> <!--<![endif]-->
{% include 'head' %}
<body class="{% block body_classes %}{% endblock %}">
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<!--[if lte IE 8]><html class="ie ie8 lt9 lte8 lte7"> <![endif]-->
<!--[if IE 9]><html class="ie ie9 lte9"> <![endif]-->
<!--[if gt IE 9]><html><![endif]-->
<!--[if !IE]><!--><html><!--<![endif]-->
{% include 'head' %}
<body class="{% block body_classes %}{% endblock %}">
{% include 'navbar' %}
{% include 'navbar' %}
<div class="container">
<div class="row">
{% block content_wrapper %}
<main class="col-md-10">
{% block content %}{% endblock %}
</main>
{% endblock %}
<div class="container">
<div class="row">
{% block content_wrapper %}
<main class="col-md-10">
{% block content %}{% endblock %}
</main>
{% endblock %}
{% include 'sidebar' %}
</div>{# .row #}
</div>{# .container #}
{% include 'sidebar' %}
</div>{# .row #}
</div>{# .container #}
{% include 'footer_content' %}
{% include 'footer_scripts' %}
</body>
{% include 'footer_content' %}
{% include 'footer_scripts' %}
</body>
</html>

View file

@ -3,38 +3,40 @@
{% block body_classes 'page--blog page--blog__post' %}
{% block content_wrapper %}
<main class="col-md-10">
{% include 'post_header' %}
<main class="col-md-10">
{% include 'post_header' %}
{% block content %}{% endblock %}
{% block content %}{% endblock %}
{% if page.related -%}
<h2>Related Posts</h2>
{% 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 %}
<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>
{% 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 %}
{% include 'about_author' %}
{% 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 'about_author' %}
{% 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 %}
</main>
</main>
{% endblock %}

View file

@ -1,9 +0,0 @@
<!DOCTYPE html>
{% spaceless %}
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0;url={{ page.destination }}" />
</head>
</html>
{% endspaceless %}