Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 21 insertions, 0 deletions

diff --git a/aboutwilson/templates/pagination.html b/aboutwilson/templates/pagination.html
new file mode 100644
index 0000000..6783ae5
--- /dev/null
+++ b/aboutwilson/templates/pagination.html
@@ -0,0 +1,21 @@
+<div class="pagination">
+<ul>
+{% if articles_page.has_previous() %}
+{% set num = articles_page.previous_page_number() %}
+    <li class="prev"><a href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">&larr; Previous</a></li>
+{% else %}
+    <li class="prev disabled"><a href="#">&larr; Previous</a></li>
+{% endif %}
+
+{% for num in range( 1, 1 + articles_paginator.num_pages ) %}
+    <li class="{{ 'active' if num == articles_page.number else '' }}"><a href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li>
+{% endfor %}
+
+{% if articles_page.has_next() %}
+    <li class="next"><a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">Next &rarr;</a></li>
+{% else %}
+    <li class="next disabled"><a href="#">&rarr; Next</a></li>
+{% endif %}
+
+</ul>
+</div>