weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Cat and tag page generation - update dates list with articles of current tag/category

Browse source
This commit is contained in:
Laureline Guerin 2011-02-15 13:44:36 +01:00
commit be7274064b
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pelican/generators.py
View file

@ -162,32 +162,34 @@ class ArticlesGenerator(Generator):
# and subfolders after that # and subfolders after that
for tag, articles in self.tags.items(): for tag, articles in self.tags.items():
dates = [article for article in self.dates if article in articles]
if self.settings.get('WITH_PAGINATION'): if self.settings.get('WITH_PAGINATION'):
articles_paginator = Paginator(articles, articles_paginator = Paginator(articles,
self.settings.get('DEFAULT_PAGINATION'), self.settings.get('DEFAULT_PAGINATION'),
self.settings.get('DEFAULT_ORPHANS')) self.settings.get('DEFAULT_ORPHANS'))
for page_num in range(articles_paginator.num_pages): for page_num in range(articles_paginator.num_pages):
write('tag/%s%s.html' % (tag, '%s' % (page_num > 0 and page_num+1 or '')), write('tag/%s%s.html' % (tag, '%s' % (page_num > 0 and page_num+1 or '')),
templates['tag'], self.context, tag=tag, articles=articles, templates['tag'], self.context, tag=tag, articles=articles, dates=dates,
articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1), articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
page_name='tag/%s'%tag) page_name='tag/%s'%tag)
else: else:
write('tag/%s.html' % tag, templates['tag'], self.context, write('tag/%s.html' % tag, templates['tag'], self.context,
tag=tag, articles=articles) tag=tag, articles=articles, dates=dates)
for cat, articles in self.categories: for cat, articles in self.categories:
dates = [article for article in self.dates if article in articles]
if self.settings.get('WITH_PAGINATION'): if self.settings.get('WITH_PAGINATION'):
articles_paginator = Paginator(articles, articles_paginator = Paginator(articles,
self.settings.get('DEFAULT_PAGINATION'), self.settings.get('DEFAULT_PAGINATION'),
self.settings.get('DEFAULT_ORPHANS')) self.settings.get('DEFAULT_ORPHANS'))
for page_num in range(articles_paginator.num_pages): for page_num in range(articles_paginator.num_pages):
write('category/%s%s.html' % (cat, '%s' % (page_num > 0 and page_num+1 or '')), write('category/%s%s.html' % (cat, '%s' % (page_num > 0 and page_num+1 or '')),
templates['category'], self.context, category=cat, articles=articles, templates['category'], self.context, category=cat, articles=articles, dates=dates,
articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1), articles_paginator=articles_paginator, articles_page=articles_paginator.page(page_num+1),
page_name='category/%s' % cat) page_name='category/%s' % cat)
else: else:
write('category/%s.html' % cat, templates['category'], self.context, write('category/%s.html' % cat, templates['category'], self.context,
category=cat, articles=articles) category=cat, articles=articles, dates=dates)
def generate_context(self): def generate_context(self):
"""change the context""" """change the context"""