diff --git a/i2p2www/__init__.py b/i2p2www/__init__.py index c700141e..e7d88441 100644 --- a/i2p2www/__init__.py +++ b/i2p2www/__init__.py @@ -12,7 +12,7 @@ CURRENT_I2P_VERSION = '0.9.4' CANONICAL_DOMAIN = 'www.i2p2.de' -BLOG_ENTRIES_PER_PAGE = 20 +BLOG_POSTS_PER_PAGE = 20 MEETINGS_PER_PAGE = 20 SUPPORTED_LANGS = [ diff --git a/i2p2www/blog/helpers.py b/i2p2www/blog/helpers.py index f0ca999f..2c92bcbe 100644 --- a/i2p2www/blog/helpers.py +++ b/i2p2www/blog/helpers.py @@ -20,34 +20,34 @@ SUPPORTED_METATAGS = { # Blog helper methods def get_blog_feed_items(num=0): - entries = get_blog_entries(num) + posts = get_blog_posts(num) items = [] - for entry in entries: - meta = entry[3] - parts = entry[4] + for post in posts: + meta = post[3] + parts = post[4] a = {} a['title'] = parts['title'] a['content'] = meta['excerpt'] if len(meta['excerpt']) > 0 else parts['fragment'] - a['url'] = url_for('blog_entry', lang=g.lang, slug=entry[0]) + a['url'] = url_for('blog_post', lang=g.lang, slug=post[0]) a['updated'] = datetime.datetime.strptime(meta['date'], '%Y-%m-%d') items.append(a) return items -def get_blog_entries(num=0): +def get_blog_posts(num=0): """ - Returns the latest #num valid entries sorted by date, or all slugs if num=0. + Returns the latest #num valid posts sorted by date, or all slugs if num=0. """ slugs = get_blog_slugs(num) - entries= [] + posts= [] for slug in slugs: - parts = render_blog_entry(slug) + parts = render_blog_post(slug) if parts: meta = get_metadata_from_meta(parts['meta']) date = get_date_from_slug(slug) titlepart = slug.rsplit('/', 1)[1] title = ' '.join(titlepart.split('_')) - entries.append((slug, date, title, meta, parts)) - return entries + posts.append((slug, date, title, meta, parts)) + return posts def get_blog_slugs(num=0): """ @@ -74,9 +74,9 @@ def get_date_from_slug(slug): parts = slug.split('/') return "%s-%s-%s" % (parts[0], parts[1], parts[2]) -def render_blog_entry(slug): +def render_blog_post(slug): """ - Render the blog entry + Render the blog post TODO: - caching - move to own file diff --git a/i2p2www/blog/views.py b/i2p2www/blog/views.py index 0d6f824e..da04ee22 100644 --- a/i2p2www/blog/views.py +++ b/i2p2www/blog/views.py @@ -1,8 +1,8 @@ from flask import abort, render_template, request from werkzeug.contrib.atom import AtomFeed -from i2p2www import BLOG_ENTRIES_PER_PAGE -from i2p2www.blog.helpers import get_blog_entries, get_blog_feed_items, get_metadata_from_meta, render_blog_entry +from i2p2www import BLOG_POSTS_PER_PAGE +from i2p2www.blog.helpers import get_blog_posts, get_blog_feed_items, get_metadata_from_meta, render_blog_post from i2p2www.helpers import Pagination, get_for_page @@ -10,21 +10,21 @@ from i2p2www.helpers import Pagination, get_for_page # Blog views def blog_index(page): - all_entries = get_blog_entries() - entries = get_for_page(all_entries, page, BLOG_ENTRIES_PER_PAGE) - if not entries and page != 1: + all_posts = get_blog_posts() + posts = get_for_page(all_posts, page, BLOG_POSTS_PER_PAGE) + if not posts and page != 1: abort(404) - pagination = Pagination(page, BLOG_ENTRIES_PER_PAGE, len(all_entries)) - return render_template('blog/index.html', pagination=pagination, entries=entries) + pagination = Pagination(page, BLOG_POSTS_PER_PAGE, len(all_posts)) + return render_template('blog/index.html', pagination=pagination, posts=posts) -def blog_entry(slug): - # try to render that blog entry.. throws 404 if it does not exist - parts = render_blog_entry(slug) +def blog_post(slug): + # try to render that blog post.. throws 404 if it does not exist + parts = render_blog_post(slug) if parts: meta = get_metadata_from_meta(parts['meta']) # now just pass to simple template file and we are done - return render_template('blog/entry.html', parts=parts, title=parts['title'], body=parts['fragment'], slug=slug, meta=meta) + return render_template('blog/post.html', parts=parts, title=parts['title'], body=parts['fragment'], slug=slug, meta=meta) else: abort(404) @@ -33,7 +33,7 @@ def blog_rss(): pass def blog_atom(): - # TODO: Only output beginning of each blog entry + # TODO: Only output beginning of each blog post feed = AtomFeed('I2P Blog', feed_url=request.url, url=request.url_root) items = get_blog_feed_items(10) for item in items: diff --git a/i2p2www/legacy.py b/i2p2www/legacy.py index 3103df15..c185e8e8 100644 --- a/i2p2www/legacy.py +++ b/i2p2www/legacy.py @@ -132,4 +132,4 @@ def legacy_meeting(id): return redirect(url_for('meetings_show', id=id, lang='en')) def legacy_status(year, month, day): - return redirect(url_for('blog_entry', lang='en', slug=('%s/%s/%s/status' % (year, month, day)))) + return redirect(url_for('blog_post', lang='en', slug=('%s/%s/%s/status' % (year, month, day)))) diff --git a/i2p2www/pages/blog/index.html b/i2p2www/pages/blog/index.html index ad109873..33132183 100644 --- a/i2p2www/pages/blog/index.html +++ b/i2p2www/pages/blog/index.html @@ -5,20 +5,20 @@ {%- endblock %} {% block content %}

Some descriptive text.

-