Skip to content

Commit 9727d85

Browse files
felixfonteinfelixfontein
committedDec 5, 2016
Accomodating for INDEXES_STATIC.
·
v8.3.1v7.8.2
1 parent f78a4be commit 9727d85

File tree

7 files changed

+51
-18
lines changed

7 files changed

+51
-18
lines changed
 

‎nikola/data/themes/base-jinja/templates/index.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{{ front_index_header }}
1818
{% endif %}
1919
{% if page_links %}
20-
{{ pagination.page_navigation(current_page, page_links, prevlink, nextlink) }}
20+
{{ pagination.page_navigation(current_page, page_links, prevlink, nextlink, prev_next_links_reversed) }}
2121
{% endif %}
2222
<div class="postindex">
2323
{% for post in posts %}

‎nikola/data/themes/base-jinja/templates/pagination_helper.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{# -*- coding: utf-8 -*- #}
2-
{% macro page_navigation(current_page, page_links, prevlink, nextlink) %}
2+
{% macro page_navigation(current_page, page_links, prevlink, nextlink, prev_next_links_reversed) %}
33
<div class="page-navigation">
44
{% for i, link in enumerate(page_links) %}
55
{% if abs(i - current_page) <= 3 or i == 0 or i == page_links|length - 1 %}

‎nikola/data/themes/base/templates/index.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
${front_index_header}
1818
% endif
1919
% if page_links:
20-
${pagination.page_navigation(current_page, page_links, prevlink, nextlink)}
20+
${pagination.page_navigation(current_page, page_links, prevlink, nextlink, prev_next_links_reversed)}
2121
% endif
2222
<div class="postindex">
2323
% for post in posts:

‎nikola/data/themes/base/templates/pagination_helper.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## -*- coding: utf-8 -*-
2-
<%def name="page_navigation(current_page, page_links, prevlink, nextlink)">
2+
<%def name="page_navigation(current_page, page_links, prevlink, nextlink, prev_next_links_reversed)">
33
<div class="page-navigation">
44
% for i, link in enumerate(page_links):
55
% if abs(i - current_page) <= 3 or i == 0 or i == len(page_links) - 1:

‎nikola/data/themes/bootstrap3-jinja/templates/pagination_helper.tmpl

+23-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,35 @@
11
{# -*- coding: utf-8 -*- #}
2-
{% macro page_navigation(current_page, page_links, prevlink, nextlink) %}
2+
{% macro page_navigation(current_page, page_links, prevlink, nextlink, prev_next_links_reversed) %}
33
<nav aria-label="Page navigation">
44
<ul class="pagination">
5-
{% if prevlink %}
6-
<li><a href="{{ prevlink }}" aria-label="{{ messages("Newer posts") }}"><span aria-hidden="true">&laquo;</span></a></li>
5+
{% if prev_next_links_reversed %}
6+
{% if nextlink %}
7+
<li><a href="{{ nextlink }}" aria-label="{{ messages("Older posts") }}"><span aria-hidden="true">&laquo;</span></a></li>
8+
{% else %}
9+
<li class="disabled"><a href="#" aria-label="{{ messages("Older posts") }}"><span aria-hidden="true">&laquo;</span></a></li>
10+
{% endif %}
711
{% else %}
8-
<li class="disabled"><a href="#" aria-label="{{ messages("Newer posts") }}"><span aria-hidden="true">&laquo;</span></a></li>
12+
{% if prevlink %}
13+
<li><a href="{{ prevlink }}" aria-label="{{ messages("Newer posts") }}"><span aria-hidden="true">&laquo;</span></a></li>
14+
{% else %}
15+
<li class="disabled"><a href="#" aria-label="{{ messages("Newer posts") }}"><span aria-hidden="true">&laquo;</span></a></li>
16+
{% endif %}
917
{% endif %}
1018
{% for i, link in enumerate(page_links) %}
1119
<li {{ ' class="active"' if i == current_page else '' }}><a href="{{ link }}">{{ i + 1 }}{{ ' <span class="sr-only">(current)</span>' if i == current_page else '' }}</a></li>
1220
{% endfor %}
13-
{% if nextlink %}
14-
<li><a href="{{ nextlink }}" aria-label="{{ messages("Older posts") }}"><span aria-hidden="true">&raquo;</span></a></li>
21+
{% if prev_next_links_reversed %}
22+
{% if prevlink %}
23+
<li><a href="{{ prevlink }}" aria-label="{{ messages("Newer posts") }}"><span aria-hidden="true">&raquo;</span></a></li>
24+
{% else %}
25+
<li class="disabled"><a href="#" aria-label="{{ messages("Newer posts") }}"><span aria-hidden="true">&raquo;</span></a></li>
26+
{% endif %}
1527
{% else %}
16-
<li class="disabled"><a href="#" aria-label="{{ messages("Older posts") }}"><span aria-hidden="true">&raquo;</span></a></li>
28+
{% if nextlink %}
29+
<li><a href="{{ nextlink }}" aria-label="{{ messages("Older posts") }}"><span aria-hidden="true">&raquo;</span></a></li>
30+
{% else %}
31+
<li class="disabled"><a href="#" aria-label="{{ messages("Older posts") }}"><span aria-hidden="true">&raquo;</span></a></li>
32+
{% endif %}
1733
{% endif %}
1834
</ul>
1935
</nav>

‎nikola/data/themes/bootstrap3/templates/pagination_helper.tmpl

+23-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,35 @@
11
## -*- coding: utf-8 -*-
2-
<%def name="page_navigation(current_page, page_links, prevlink, nextlink)">
2+
<%def name="page_navigation(current_page, page_links, prevlink, nextlink, prev_next_links_reversed)">
33
<nav aria-label="Page navigation">
44
<ul class="pagination">
5-
% if prevlink:
6-
<li><a href="${prevlink}" aria-label="${messages("Newer posts")}"><span aria-hidden="true">&laquo;</span></a></li>
5+
% if prev_next_links_reversed:
6+
% if nextlink:
7+
<li><a href="${nextlink}" aria-label="${messages("Older posts")}"><span aria-hidden="true">&laquo;</span></a></li>
8+
% else:
9+
<li class="disabled"><a href="#" aria-label="${messages("Older posts")}"><span aria-hidden="true">&laquo;</span></a></li>
10+
% endif
711
% else:
8-
<li class="disabled"><a href="#" aria-label="${messages("Newer posts")}"><span aria-hidden="true">&laquo;</span></a></li>
12+
% if prevlink:
13+
<li><a href="${prevlink}" aria-label="${messages("Newer posts")}"><span aria-hidden="true">&laquo;</span></a></li>
14+
% else:
15+
<li class="disabled"><a href="#" aria-label="${messages("Newer posts")}"><span aria-hidden="true">&laquo;</span></a></li>
16+
% endif
917
% endif
1018
% for i, link in enumerate(page_links):
1119
<li ${' class="active"' if i == current_page else ''}><a href="${link}">${i + 1}${' <span class="sr-only">(current)</span>' if i == current_page else ''}</a></li>
1220
% endfor
13-
% if nextlink:
14-
<li><a href="${nextlink}" aria-label="${messages("Older posts")}"><span aria-hidden="true">&raquo;</span></a></li>
21+
% if prev_next_links_reversed:
22+
% if prevlink:
23+
<li><a href="${prevlink}" aria-label="${messages("Newer posts")}"><span aria-hidden="true">&raquo;</span></a></li>
24+
% else:
25+
<li class="disabled"><a href="#" aria-label="${messages("Newer posts")}"><span aria-hidden="true">&raquo;</span></a></li>
26+
% endif
1527
% else:
16-
<li class="disabled"><a href="#" aria-label="${messages("Older posts")}"><span aria-hidden="true">&raquo;</span></a></li>
28+
% if nextlink:
29+
<li><a href="${nextlink}" aria-label="${messages("Older posts")}"><span aria-hidden="true">&raquo;</span></a></li>
30+
% else:
31+
<li class="disabled"><a href="#" aria-label="${messages("Older posts")}"><span aria-hidden="true">&raquo;</span></a></li>
32+
% endif
1733
% endif
1834
</ul>
1935
</nav>

‎nikola/nikola.py

+1
Original file line numberDiff line numberDiff line change
@@ -2432,6 +2432,7 @@ def generic_index_renderer(self, lang, posts, indexes_title, template_name, cont
24322432
if kw['show_index_page_navigation']:
24332433
context['page_links'] = page_links_context
24342434
context['current_page'] = ipages_i - 1
2435+
context['prev_next_links_reversed'] = kw['indexes_static']
24352436
context["permalink"] = page_links[i]
24362437
output_name = os.path.join(kw['output_folder'], page_path(i, ipages_i, num_pages, False))
24372438
task = self.generic_post_list_renderer(

0 commit comments

Comments
 (0)
Please sign in to comment.