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: 00acea858693
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 641eacde5522
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 11, 2016

  1. Fixing typo.

    @felixfontein
    felixfontein committed Dec 11, 2016
    Copy the full SHA
    bfad316 View commit details

  2. Revert "Using the new feature for simplifying link creation logic for… 

    … indexes." as that commit doesn't work with INDEXES_PRETTY_PAGE_URL.

This reverts commit 00acea8.
    @felixfontein
    felixfontein committed Dec 11, 2016
    Copy the full SHA
    641eacd View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 nikola/nikola.py
  2. +2 −2 nikola/plugins/task/taxonomies.py
4 changes: 2 additions & 2 deletions nikola/nikola.py
View file
Original file line number Diff line number Diff line change
@@ -2386,7 +2386,7 @@ def generic_index_renderer(self, lang, posts, indexes_title, template_name, cont
kw["indexes_pages"] = self.config['INDEXES_PAGES'](lang)
kw["indexes_pages_main"] = self.config['INDEXES_PAGES_MAIN']
kw["indexes_static"] = self.config['INDEXES_STATIC']
kw['indexes_prety_page_url'] = self.config["INDEXES_PRETTY_PAGE_URL"]
kw['indexes_pretty_page_url'] = self.config["INDEXES_PRETTY_PAGE_URL"]
kw['demote_headers'] = self.config['DEMOTE_HEADERS']
kw['generate_atom'] = self.config["GENERATE_ATOM"]
kw['feed_links_append_query'] = self.config["FEED_LINKS_APPEND_QUERY"]
@@ -2511,7 +2511,7 @@ def generic_index_renderer(self, lang, posts, indexes_title, template_name, cont
}
yield utils.apply_filters(atom_task, kw['filters'])

if kw["indexes_pages_main"] and kw['indexes_prety_page_url'](lang):
if kw["indexes_pages_main"] and kw['indexes_pretty_page_url'](lang):
# create redirection
output_name = os.path.join(kw['output_folder'], page_path(0, displayed_page_numbers[0], num_pages, True))
link = page_links[0]
4 changes: 2 additions & 2 deletions nikola/plugins/task/taxonomies.py
View file
Original file line number Diff line number Diff line change
@@ -230,11 +230,11 @@ def _generate_classification_page_as_index(self, taxonomy, classification, filte

def page_link(i, displayed_i, num_pages, force_addition, extension=None):
feed = "{}_atom" if extension == ".atom" else "{}"
return self.site.link(feed.format(kind), classification, lang, page=i)
return utils.adjust_name_for_index_link(self.site.link(feed.format(kind), classification, lang), i, displayed_i, lang, self.site, force_addition, extension)

def page_path(i, displayed_i, num_pages, force_addition, extension=None):
feed = "{}_atom" if extension == ".atom" else "{}"
return self.site.path(feed.format(kind), classification, lang, page=i)
return utils.adjust_name_for_index_path(self.site.path(feed.format(kind), classification, lang), i, displayed_i, lang, self.site, force_addition, extension)

context = copy(context)
if "pagekind" not in context: