Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 19 insertions, 0 deletions

diff --git a/zurb-F5-basic/templates/pagination.html b/zurb-F5-basic/templates/pagination.html
new file mode 100644
index 0000000..4f06408
--- /dev/null
+++ b/zurb-F5-basic/templates/pagination.html
@@ -0,0 +1,19 @@
+{% if DEFAULT_PAGINATION %}

+<div class="pagination-centered">

+<h6 class="subheader">Page {{ articles_page.number }} of {{ articles_paginator.num_pages }}</h6>

+

+<p>

+    {% if articles_page.has_previous() %}

+        {% if articles_page.previous_page_number() == 1 %}

+            <a href="{{ SITEURL }}/{{ page_name }}.html">&laquo; Prev</a>

+        {% else %}

+            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">&laquo; Prev</a>

+        {% endif %}

+    {% endif %}

+

+    {% if articles_page.has_next() %}

+        <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">Next &raquo;</a>

+    {% endif %}

+</p>

+</div>

+{% endif %}