Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c3de0f2be758
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d32a8181b1c0
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 6, 2016

  1. Fixing ellipsis.

    @felixfontein
    felixfontein committed Dec 6, 2016
    Copy the full SHA
    c8f6dfe View commit details

  2. Improving code.

    @felixfontein
    felixfontein committed Dec 6, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d32a818 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 nikola/data/themes/base-jinja/templates/pagination_helper.tmpl
  2. +1 −1 nikola/data/themes/base/templates/pagination_helper.tmpl
  3. +2 −2 nikola/nikola.py
2 changes: 1 addition & 1 deletion nikola/data/themes/base-jinja/templates/pagination_helper.tmpl
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<a href="{{ page_links[i] }}">{{ i+1 }}</a>
{% endif %}
{% elif i == current_page - surrounding - 1 or i == current_page + surrounding + 1 %}
<span class="ellipsis">&#x22EF;</span>
<span class="ellipsis">…</span>
{% endif %}
{% endfor %}
</div>
2 changes: 1 addition & 1 deletion nikola/data/themes/base/templates/pagination_helper.tmpl
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<a href="${page_links[i]}">${i+1}</a>
% endif
% elif i == current_page - surrounding - 1 or i == current_page + surrounding + 1:
<span class="ellipsis">&#x22EF;</span>
<span class="ellipsis">…</span>
% endif
% endfor
</div>
4 changes: 2 additions & 2 deletions nikola/nikola.py
View file
Original file line number Diff line number Diff line change
@@ -2376,8 +2376,8 @@ def generic_index_renderer(self, lang, posts, indexes_title, template_name, cont
lists.append(posts[:kw["index_display_post_count"]])
posts = posts[kw["index_display_post_count"]:]
num_pages = len(lists)
displayed_page_numbers = [utils.get_displayed_page_number(i, num_pages, self) for i in range(max(num_pages, 1))]
page_links = [page_link(i, displayed_page_numbers[i], num_pages, False) for i in range(max(num_pages, 1))]
displayed_page_numbers = [utils.get_displayed_page_number(i, num_pages, self) for i in range(num_pages or 1)]
page_links = [page_link(i, page_number, num_pages, False) for i in enumerate(displayed_page_numbers)]
if kw['show_index_page_navigation']:
temp_map = {page_number - 1: link for page_number, link in zip(displayed_page_numbers, page_links)}
page_links_context = [temp_map[i] for i in range(num_pages)]