aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/_includes
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2017-06-25 07:24:53 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2017-06-25 07:24:53 +0300
commit5b895e54688c909734fbe064b218edb0b24b2749 (patch)
treefe1cd39a7ed5a7942760af6ca0b8df2e2029b324 /_includes
parentfix navbar links with multiple pages (diff)
downloadjekyll-theme-5b895e54688c909734fbe064b218edb0b24b2749.tar.gz
jekyll-theme-5b895e54688c909734fbe064b218edb0b24b2749.zip
fix post pagination links
* Account for custom paginate_path in _includes/common/pagination.html.
Diffstat (limited to '_includes')
-rw-r--r--_includes/common/pagination.html23
1 files changed, 8 insertions, 15 deletions
diff --git a/_includes/common/pagination.html b/_includes/common/pagination.html
index aa2f034..aaad762 100644
--- a/_includes/common/pagination.html
+++ b/_includes/common/pagination.html
@@ -1,28 +1,21 @@
{% if site.posts.size != 0 %}
<ul class="pagination">
{% if paginator.previous_page %}
- {% if paginator.previous_page == 1 %}
- <li><a href="{{ site.baseurl }}/"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Prev</a></li>
- {% else %}
- <li><a href="{{ site.baseurl }}/page{{ paginator.previous_page }}"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Prev</a></li>
- {% endif %}
+ <li><a href="{{ site.baseurl }}{{ paginator.previous_page_path }}"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Prev</a></li>
{% else %}
<li class="disabled"><a href="#"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Prev</a></li>
{% endif %}
- {% if paginator.page == 1 %}
- <li class="active"><a href="{{ site.baseurl }}/">1</a></li>
- {% else %}
- <li><a href="{{ site.baseurl }}/">1</a></li>
- {% endif %}
- {% for count in (2..paginator.total_pages) %}
- {% if count == paginator.page %}
- <li class="active"><a href="{{ site.baseurl }}/page{{ count }}">{{ count }}</a></li>
+ {% for page_number in (1..paginator.total_pages) %}
+ {% if page_number == paginator.page %}
+ <li class="active"><a href="#">{{ page_number }}</a></li>
+ {% elsif page_number == 1 %}
+ <li><a href="{{ site.baseurl }}/">{{ page_number }}</a></li>
{% else %}
- <li><a href="{{ site.baseurl }}/page{{ count }}">{{ count }}</a></li>
+ <li><a href="{{ site.baseurl }}{{ site.paginate_path | replace: ':num', page_number }}">{{ page_number }}</a></li>
{% endif %}
{% endfor %}
{% if paginator.next_page %}
- <li><a href="{{ site.baseurl }}/page{{ paginator.next_page }}">Next&nbsp;<span class="glyphicon glyphicon-chevron-right"></span></a></li>
+ <li><a href="{{ site.baseurl }}{{ paginator.next_page_path }}">Next&nbsp;<span class="glyphicon glyphicon-chevron-right"></span></a></li>
{% else %}
<li class="disabled"><a href="#">Next&nbsp;<span class="glyphicon glyphicon-chevron-right"></span></a></li>
{% endif %}