Merge pull request #106 from dongweiming/jinja2

categories/detail.html use jinja2

Author: mozillazg

firefly/app.py

@@ -97,6 +97,13 @@ def get_locale():
     def before_request():
         g.locale = get_locale()
 
+    @app.context_processor
+    def inject_builtin():
+        return {
+            'hasattr': hasattr,
+            'len': len
+        }
+
 
 def plug_to_db(db):
     from firefly.models.utils import dict_filter

firefly/templates/categories/detail.html

@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block outlet %}
+<h1>{{category}}</h1>
+  {% for post in posts %}
+<h2>
+    <a href="{{post.url()}}">{{post.title}}</a>
+      {% if post.body %}
+        {% if post.post_type == 'Quote' %}
+    <blockquote>{{post.body}}</blockquote>
+    <p>{{post.author}}</p>
+        {% else %}
+    <p>{{post.body}}</p>
+        {% endif %}
+    {% endif %}
+    {% if hasattr(post, 'embed_code') and post.embed_code %}
+        {{post.embed_code}}
+    {% endif %}
+    {% if hasattr(post, 'image_url') and post.image_url %}
+    <p>
+        <img alt="" src="{{post.image_url}}"/>
+    </p>
+    {% endif %}
+    <p>{{post.created_at.strftime('%H:%M %Y-%m-%d')}}</p>
+    {% set total = len(post.comments) %}
+        {{total}} comment
+</h2>
+{% endfor %}
+{% endblock %}

firefly/templates/categories/list.html

@@ -17,7 +17,7 @@ def get(self, slug):
         posts = Post.objects.filter(
             category=category
         ).order_by("-recent_activity_time")
-        return render_template('categories/list.html',
+        return render_template('categories/detail.html',
                                category=category.name,
                                posts=posts)
 

firefly/views/category.py

@@ -39,7 +39,7 @@ class DetailView(MethodView):
     def get(self, id):
         post = Post.objects.get_or_404(id=id)
         Post.objects(id=id).update_one(inc__views=1)
-        return render_template('posts/detail.html', post=post, hasattr=hasattr,
+        return render_template('posts/detail.html', post=post,
                                Markdown=Markdown, gen_author=gen_author,
                                gen_author_name=gen_author_name,
                                short_timesince=short_timesince)