Indent jinja code blocks, allow editors to collapse regions

main
Raymond Wanyoike 2017-11-21 11:17:33 +03:00
parent 4aee394acb
commit 75a023e04c
16 changed files with 253 additions and 249 deletions

View File

@ -1,18 +1,18 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %} {% block title %}
Archives {{ super() }} Archives {{ super() }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
Archives Archives
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<dl class="row"> <dl class="row">
{% for article in dates %} {% for article in dates %}
<dt class="col-sm-4">{{ article.locale_date }}</dt> <dt class="col-sm-4">{{ article.locale_date }}</dt>
<dd class="col-sm-8"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd> <dd class="col-sm-8"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
{% endfor %} {% endfor %}
</dl> </dl>
{% endblock %} {% endblock %}

View File

@ -1,51 +1,51 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block head %} {% block head %}
{{ super() }} {{ super() }}
<meta name="description" content="{{ article.summary|striptags }}"> <meta name="description" content="{{ article.summary|striptags }}">
{% endblock %} {% endblock %}
{% block title %} {% block title %}
{{ article.title|striptags }} {{ super() }} {{ article.title|striptags }} {{ super() }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
{{ article.title }} {{ article.title }}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<article class="article"> <article class="article">
<header> <header>
<ul class="list-inline"> <ul class="list-inline">
<li class="list-inline-item text-muted" title="{{ article.date.isoformat() }}"> <li class="list-inline-item text-muted" title="{{ article.date.isoformat() }}">
<i class="fa fa-clock-o"></i> <i class="fa fa-clock-o"></i>
{{ article.locale_date }} {{ article.locale_date }}
</li> </li>
<li class="list-inline-item"> <li class="list-inline-item">
<i class="fa fa-folder-open-o"></i> <i class="fa fa-folder-open-o"></i>
<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
</li> </li>
{% if not HIDE_AUTHORS and article.authors %} {% if not HIDE_AUTHORS and article.authors %}
<li class="list-inline-item"> <li class="list-inline-item">
<i class="fa fa-user-o"></i> <i class="fa fa-user-o"></i>
{% for author in article.authors %} {% for author in article.authors %}
<a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %} <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %}
{% endfor %} {% endfor %}
</li> </li>
{% endif %} {% endif %}
{% if article.tags %} {% if article.tags %}
<li class="list-inline-item"> <li class="list-inline-item">
<i class="fa fa-files-o"></i> <i class="fa fa-files-o"></i>
{% for tag in article.tags %} {% for tag in article.tags %}
<a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}</a>{% if not loop.last %}, {% endif %} <a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}</a>{% if not loop.last %}, {% endif %}
{% endfor %} {% endfor %}
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
</header> </header>
<div class="content"> <div class="content">
{{ article.content }} {{ article.content }}
</div> </div>
</article> </article>
{% include 'include/comments.html' %} {% include 'include/comments.html' %}
{% endblock %} {% endblock %}

View File

@ -1,9 +1,9 @@
{% extends "index.html" %} {% extends "index.html" %}
{% block title %} {% block title %}
{{ author }} Articles | {{ SITENAME }} {{ author }} Articles | {{ SITENAME }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
{{ author }} Articles {{ author }} Articles
{% endblock %} {% endblock %}

View File

@ -1,20 +1,20 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %} {% block title %}
Authors {{ super() }} Authors {{ super() }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
Authors Authors
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<table class="table table-bordered table-striped table-hover"> <table class="table table-bordered table-striped">
{% for author, articles in authors|sort %} {% for author, articles in authors|sort %}
<tr> <tr>
<td><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a></td> <td><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a></td>
<td>{{ articles|count }}</td> <td>{{ articles|count }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% endblock %} {% endblock %}

View File

@ -11,11 +11,11 @@
<link rel="canonical" href="{{ SITEURL }}/{{ output_file }}"> <link rel="canonical" href="{{ SITEURL }}/{{ output_file }}">
{% if RFG_FAVICONS %} {% if RFG_FAVICONS %}
<link rel="apple-touch-icon" href="{{ SITEURL }}/apple-touch-icon.png" sizes="180x180"> <link rel="apple-touch-icon" href="{{ SITEURL }}/apple-touch-icon.png" sizes="180x180">
<link rel="icon" type="image/png" href="{{ SITEURL }}/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="{{ SITEURL }}/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="{{ SITEURL }}/favicon-16x16.png" sizes="16x16"> <link rel="icon" type="image/png" href="{{ SITEURL }}/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="{{ SITEURL }}/manifest.json"> <link rel="manifest" href="{{ SITEURL }}/manifest.json">
<meta name="theme-color" content="#333333"> <meta name="theme-color" content="#333333">
{% endif %} {% endif %}
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/bootstrap.min.css"> <link rel="stylesheet" href="{{ SITEURL }}/theme/css/bootstrap.min.css">

View File

@ -1,20 +1,20 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %} {% block title %}
Categories {{ super() }} Categories {{ super() }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
Categories Categories
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<table class="table table-bordered table-striped table-hover"> <table class="table table-bordered table-striped">
{% for category, articles in categories|sort %} {% for category, articles in categories|sort %}
<tr> <tr>
<td><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></td> <td><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></td>
<td>{{ articles|count }}</td> <td>{{ articles|count }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% endblock %} {% endblock %}

View File

@ -1,9 +1,9 @@
{% extends "index.html" %} {% extends "index.html" %}
{% block title %} {% block title %}
{{ category }} Articles | {{ SITENAME }} {{ category }} Articles | {{ SITENAME }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
{{ category }} Articles {{ category }} Articles
{% endblock %} {% endblock %}

View File

@ -1,51 +1,53 @@
{% if GOOGLE_ANALYTICS %} {% if GOOGLE_ANALYTICS %}
<script> <script>
(function(i, s, o, g, r, a, m) { (function(i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r; i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function() { i[r] = i[r] || function() {
(i[r].q = i[r].q || []).push(arguments) (i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date(); }, i[r].l = 1 * new Date();
a = s.createElement(o); a = s.createElement(o);
a.async = 1; a.async = 1;
a.src = g; a.src = g;
m = s.getElementsByTagName(o)[0]; m = s.getElementsByTagName(o)[0];
m.parentNode.insertBefore(a, m) m.parentNode.insertBefore(a, m)
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga'); })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{ GOOGLE_ANALYTICS }}', 'auto'); ga('create', '{{ GOOGLE_ANALYTICS }}', 'auto');
ga('send', 'pageview'); ga('send', 'pageview');
</script> </script>
{% endif %} {% endif %}
{% if GAUGES %} {% if GAUGES %}
<script> <script>
var _gauges = _gauges || []; var _gauges = _gauges || [];
(function() { (function() {
var t = document.createElement('script'); var t = document.createElement('script');
t.type = 'text/javascript'; t.type = 'text/javascript';
t.async = true; t.async = true;
t.id = 'gauges-tracker'; t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '{{ GAUGES }}'); t.setAttribute('data-site-id', '{{ GAUGES }}');
t.src = 'https://secure.gaug.es/track.js'; t.src = 'https://secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0]; var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s); s.parentNode.insertBefore(t, s);
})(); })();
</script> </script>
{% endif %} {% endif %}
{% if PIWIK_URL and PIWIK_SITE_ID %} {% if PIWIK_URL and PIWIK_SITE_ID %}
<script> <script>
var _paq = _paq || []; var _paq = _paq || [];
_paq.push(['trackPageView']); _paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']); _paq.push(['enableLinkTracking']);
(function() { (function() {
var u = '{{ PIWIK_URL }}/'; var u = '{{ PIWIK_URL }}/';
_paq.push(['setTrackerUrl', u + 'piwik.php']); _paq.push(['setTrackerUrl', u + 'piwik.php']);
_paq.push(['setSiteId', '{{ PIWIK_SITE_ID }}']); _paq.push(['setSiteId', '{{ PIWIK_SITE_ID }}']);
var g = document.createElement('script'); var g = document.createElement('script');
g.type = 'text/javascript'; g.type = 'text/javascript';
g.async = true; g.async = true;
g.defer = true; g.defer = true;
g.src = u + 'piwik.js'; g.src = u + 'piwik.js';
var s = document.getElementsByTagName('script')[0]; var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(g, s); s.parentNode.insertBefore(g, s);
})(); })();
</script> </script>
{% endif %} {% endif %}

View File

@ -1,20 +1,20 @@
{% if DISQUS_SITENAME %} {% if DISQUS_SITENAME %}
<hr> <hr>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
<script> <script>
var disqus_config = function() { var disqus_config = function() {
this.page.url = '{{ SITEURL }}/{{ output_file }}'; this.page.url = '{{ SITEURL }}/{{ output_file }}';
this.page.identifier = '{{ article.slug }}'; this.page.identifier = '{{ article.slug }}';
}; };
(function() { (function() {
var d = document; var d = document;
var s = d.createElement('script'); var s = d.createElement('script');
s.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js'; s.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
s.setAttribute('data-timestamp', +new Date()); s.setAttribute('data-timestamp', +new Date());
(d.head || d.body).appendChild(s); (d.head || d.body).appendChild(s);
})(); })();
</script> </script>
<noscript class="text-muted"> <noscript class="text-muted">
Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a> Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a>
</noscript> </noscript>
{% endif %} {% endif %}

View File

@ -1,24 +1,24 @@
{% if articles_paginator.num_pages > 1 %} {% if articles_paginator.num_pages > 1 %}
<hr> <hr>
<ul class="pagination"> <ul class="pagination">
{% if articles_page.has_previous() %} {% if articles_page.has_previous() %}
<li class="page-item"> <li class="page-item">
<a class="page-link" href="{{ SITEURL }}/{{ articles_previous_page.url }}"> <a class="page-link" href="{{ SITEURL }}/{{ articles_previous_page.url }}">
<span aria-hidden="true">&laquo;</span> <span aria-hidden="true">&laquo;</span>
<span class="sr-only">Previous</span> <span class="sr-only">Previous</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
<li class="page-item disabled"> <li class="page-item disabled">
<span class="page-link">{{ articles_page.number }} of {{ articles_paginator.num_pages }}</span> <span class="page-link">{{ articles_page.number }} of {{ articles_paginator.num_pages }}</span>
</li> </li>
{% if articles_page.has_next() %} {% if articles_page.has_next() %}
<li class="page-item"> <li class="page-item">
<a class="page-link" href="{{ SITEURL }}/{{ articles_next_page.url }}"> <a class="page-link" href="{{ SITEURL }}/{{ articles_next_page.url }}">
<span aria-hidden="true">&raquo;</span> <span aria-hidden="true">&raquo;</span>
<span class="sr-only">Next</span> <span class="sr-only">Next</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
{% endif %} {% endif %}

View File

@ -1,53 +1,55 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block head %} {% block head %}
{{ super() }} {{ super() }}
{% if DESCRIPTION %} {% if DESCRIPTION %}
<meta name="description" content="{{ DESCRIPTION|striptags }}"> <meta name="description" content="{{ DESCRIPTION|striptags }}">
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block title %} {% block title %}
{{ SITENAME }} | {{ SITESUBTITLE }} {{ SITENAME }} | {{ SITESUBTITLE }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
Articles Articles
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% for article in articles_page.object_list %} {% for article in articles_page.object_list %}
<article class="row teaser"> <article class="row teaser">
<header class="col-sm-4 text-muted"> <header class="col-sm-4 text-muted">
<ul> <ul>
<li title="{{ article.date.isoformat() }}"> <li title="{{ article.date.isoformat() }}">
<i class="fa fa-clock-o"></i> <i class="fa fa-clock-o"></i>
{{ article.locale_date }} {{ article.locale_date }}
</li> </li>
<li> <li>
<i class="fa fa-folder-open-o"></i> <i class="fa fa-folder-open-o"></i>
<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
</li> </li>
{% if not HIDE_AUTHORS and article.authors %} {% if not HIDE_AUTHORS and article.authors %}
<li> <li>
<i class="fa fa-user-o"></i> <i class="fa fa-user-o"></i>
{% for author in article.authors %} {% for author in article.authors %}
<a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %} <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %}
{% endfor %} {% endfor %}
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
</header> </header>
<div class="col-sm-8"> <div class="col-sm-8">
<h4 class="title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h4> <h4 class="title">
<div class="content"> <a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
{{ article.summary|striptags }} </h4>
</div> <div class="content">
</div> {{ article.summary|striptags }}
</article> </div>
{% if not loop.last %} </div>
<hr> </article>
{% endif %} {% if not loop.last %}
{% endfor %} <hr>
{% include 'include/pagination.html' %} {% endif %}
{% endfor %}
{% include 'include/pagination.html' %}
{% endblock %} {% endblock %}

View File

@ -1,22 +1,22 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block head %} {% block head %}
{{ super() }} {{ super() }}
<meta name="description" content="{{ page.summary|striptags }}"> <meta name="description" content="{{ page.summary|striptags }}">
{% endblock %} {% endblock %}
{% block title %} {% block title %}
{{ page.title|striptags }} {{ super() }} {{ page.title|striptags }} {{ super() }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
{{ page.title }} {{ page.title }}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<article class="article"> <article class="article">
<div class="content"> <div class="content">
{{ page.content }} {{ page.content }}
</div> </div>
</article> </article>
{% endblock %} {% endblock %}

View File

@ -1,18 +1,18 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %} {% block title %}
Archives for {{ period | reverse | join(' ') }} {{ super() }} Archives for {{ period | reverse | join(' ') }} {{ super() }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
Archives for {{ period | reverse | join(' ') }} Archives for {{ period | reverse | join(' ') }}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<dl class="dl-horizontal"> <dl class="dl-horizontal">
{% for article in dates %} {% for article in dates %}
<dt>{{ article.locale_date }}</dt> <dt>{{ article.locale_date }}</dt>
<dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd> <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
{% endfor %} {% endfor %}
</dl> </dl>
{% endblock %} {% endblock %}

View File

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
{% for article in articles %} {% for article in articles %}
<url> <url>
<loc>{{ SITEURL }}/{{ article.url }}</loc> <loc>{{ SITEURL }}/{{ article.url }}</loc>
<priority>0.8</priority> <priority>0.8</priority>
</url> </url>
{% for translation in article.translations %} {% for translation in article.translations %}
<url> <url>
<loc>{{ SITEURL }}/{{ translation.url }}</loc> <loc>{{ SITEURL }}/{{ translation.url }}</loc>
<priority>0.8</priority> <priority>0.8</priority>
</url> </url>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% for page in pages %} {% for page in pages %}
<url> <url>
<loc>{{ SITEURL }}/{{ page.url }}</loc> <loc>{{ SITEURL }}/{{ page.url }}</loc>
<priority>1.0</priority> <priority>1.0</priority>
</url> </url>
{% for translation in page.translations %} {% for translation in page.translations %}
<url> <url>
<loc>{{ SITEURL }}/{{ translation.url }}</loc> <loc>{{ SITEURL }}/{{ translation.url }}</loc>
<priority>1.0</priority> <priority>1.0</priority>
</url> </url>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
</urlset> </urlset>

View File

@ -1,9 +1,9 @@
{% extends "index.html" %} {% extends "index.html" %}
{% block title %} {% block title %}
#{{ tag }} Articles | {{ SITENAME }} #{{ tag }} Articles | {{ SITENAME }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
#{{ tag }} Articles #{{ tag }} Articles
{% endblock %} {% endblock %}

View File

@ -1,20 +1,20 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %} {% block title %}
Tags {{ super() }} Tags {{ super() }}
{% endblock %} {% endblock %}
{% block page_header %} {% block page_header %}
Tags Tags
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<table class="table table-bordered table-striped table-hover"> <table class="table table-bordered table-striped">
{% for tag, articles in tags|sort %} {% for tag, articles in tags|sort %}
<tr> <tr>
<td><a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}</a></td> <td><a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}</a></td>
<td>{{ articles|count }}</td> <td>{{ articles|count }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% endblock %} {% endblock %}