Blog entries -> Blog posts

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: