blog: Allow browing posts by tag

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 550fba37a1b57537572025eb2914eccf8d616341..8b9d93bb4d1b018dbb48870a36d9f45cc1b6df14 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,7 +111,8 @@ templates_blog_DATA = \
        src/templates/blog/feed.xml \
        src/templates/blog/index.html \
        src/templates/blog/post.html \
-       src/templates/blog/search-results.html
+       src/templates/blog/search-results.html \
+       src/templates/blog/tag.html
 
 templates_blogdir = $(templatesdir)/blog
 

diff --git a/src/backend/blog.py b/src/backend/blog.py
index f0044c89230767a40d63615265c3d2401dbdfd2a..d54565f9e0d78a40f219110615eebe382c3514ac 100644 (file)
--- a/src/backend/blog.py
+++ b/src/backend/blog.py
@@ -30,7 +30,7 @@ class Blog(misc.Object):
                        WHERE published_at IS NOT NULL \
                                AND published_at <= NOW() \
                                AND %s = ANY(tags) \
-                       ORDER BY published_at DESC LIMIT %s", limit)
+                       ORDER BY published_at DESC LIMIT %s", tag, limit)
 
        def get_by_author(self, uid, limit=None):
                return self._get_posts("SELECT * FROM blog \

diff --git a/src/templates/blog/tag.html b/src/templates/blog/tag.html
new file mode 100644 (file)
index 0000000..c956111
--- /dev/null
+++ b/src/templates/blog/tag.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% block title %}{{ _("Posts tagged with '%s'") % tag }}{% end block %}
+
+{% block main %}
+       <div class="card">
+               <div class="card-body">
+                       {% module BlogPosts(posts) %}
+               </div>
+       </div>
+{% end block %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 12fc732033ba050c76f0c17f6fba85d909251f88..48590ab57f28dc2c3d6b46903fc978958ec1f7f0 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -120,6 +120,7 @@ class Application(tornado.web.Application):
                        (r"/authors/(\w+)", blog.AuthorHandler),
                        (r"/post/(.*)", blog.PostHandler),
                        (r"/search", blog.SearchHandler),
+                       (r"/tags/([0-9a-z\-]+)", blog.TagHandler),
 
                        # RSS Feed
                        (r"/feed.xml", blog.FeedHandler),

diff --git a/src/web/blog.py b/src/web/blog.py
index f297fdbb729050a5096879e6cbfbc63f23ffc40a..52540721a419e0decb5e1b5181689d57dafcefad 100644 (file)
--- a/src/web/blog.py
+++ b/src/web/blog.py
@@ -71,6 +71,15 @@ class SearchHandler(base.BaseHandler):
                self.render("blog/search-results.html", q=q, posts=posts)
 
 
+class TagHandler(base.BaseHandler):
+       def get(self, tag):
+               posts = self.backend.blog.get_by_tag(tag)
+               if not posts:
+                       raise tornado.web.HTTPError(404, "There are no posts with tag: %s" % tag)
+
+               self.render("blog/tag.html", posts=posts, tag=tag)
+
+
 class PostModule(ui_modules.UIModule):
        def render(self, post):
                return self.render_string("blog/modules/post.html", post=post)