diff options
| -rw-r--r-- | _config.yml | 2 | ||||
| -rw-r--r-- | _includes/common/pagination.html | 23 |
2 files changed, 9 insertions, 16 deletions
diff --git a/_config.yml b/_config.yml index ba8f884..322901e 100644 --- a/_config.yml +++ b/_config.yml @@ -12,7 +12,7 @@ exclude: - posts/ paginate: 10 -paginate_path: "posts/page:num/" +paginate_path: "/posts/page:num/" include_comments: true minified_externals: true diff --git a/_includes/common/pagination.html b/_includes/common/pagination.html index aa2f034..55cb690 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> Prev</a></li> - {% else %} - <li><a href="{{ site.baseurl }}/page{{ paginator.previous_page }}"><span class="glyphicon glyphicon-chevron-left"></span> Prev</a></li> - {% endif %} + <li><a href="{{ site.baseurl }}{{ paginator.previous_page_path }}"><span class="glyphicon glyphicon-chevron-left"></span> Prev</a></li> {% else %} <li class="disabled"><a href="#"><span class="glyphicon glyphicon-chevron-left"></span> 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 }}/posts/">{{ 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 <span class="glyphicon glyphicon-chevron-right"></span></a></li> + <li><a href="{{ site.baseurl }}{{ paginator.next_page_path }}">Next <span class="glyphicon glyphicon-chevron-right"></span></a></li> {% else %} <li class="disabled"><a href="#">Next <span class="glyphicon glyphicon-chevron-right"></span></a></li> {% endif %} |