From 35ce110ab014cd75c18d91eaddd5ad30635775a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 23 Sep 2013 14:42:48 +0200
Subject: [PATCH] [IMP] website_blog: improved blog post view, to integrate
 comments and a comments pager

bzr revid: tde@openerp.com-20130923124248-zuuoqbyb1d5sqi6a
---
 addons/website_blog/controllers/main.py       | 11 +++++++
 .../views/website_blog_templates.xml          | 33 +++++++++++++------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 737cbb7959c..b7149e97d98 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -74,6 +74,17 @@ class website_mail(http.Controller):
             category = category_obj.browse(cr, uid, category_id, context=context)
             blog_post = blog_post_obj.browse(cr, uid, blog_post_id, context=context)
 
+        if blog_post_id:
+            blog_post = blog_post_obj.browse(cr, uid, blog_post_id, context=context)
+            pager = request.website.pager(
+                url="/blog/%s/%s/" % (category_id, blog_post_id),
+                total=len(blog_post.website_message_ids),
+                page=page,
+                step=self._post_comment_per_page,
+                scope=7
+            )
+            print pager
+
         values.update({
             'blog_post': blog_post,
             'blog_posts': blog_posts,
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index c5c2ef0ee62..519558bed43 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -42,24 +42,37 @@
                 <h3 t-field="blog_post.name"/>
                 <div t-field="blog_post.content"/>
             </div>
+            <hr />
+            <div class="clearfix">
+                <div class="pull-right text-right">
+                    <t t-call="website.pager" class="pull-right"/>
+                </div>
+                <t t-if="len(blog_post.website_message_ids) &lt;= 1">
+                    <t t-esc="len(blog_post.website_message_ids)"/> Comment
+                </t>
+                <t t-if="len(blog_post.website_message_ids) > 1">
+                    <t t-esc="len(blog_post.website_message_ids)"/> Comments
+                </t>
+            </div>
+            <form id="comment" t-attf-action="/blog/#{blog_post.category_id.id}/#{blog_post.id}/post#post"
+                    method="POST" class="form-horizontal text-center"
+                    groups="group_website_blog_reply">
+                <div>
+                    <textarea rows="4" placeholder="Your comment" class="form-control"></textarea>
+                </div>
+                <button type="submit" class="btn btn-default">Post your comment</button>
+            </form>
             <ul class="media-list" id="comments">
                 <li t-foreach="blog_post.website_message_ids" t-as="message" class="media">
-                    <div class="media-body">
+                    <div class="media-body well well-sm">
                         <t t-call="website.publish"><t t-set="object" t-value="message"/></t>
                         <t t-raw="message.body"/>
-                        <small class="pull-right muted text-right">
-                            <div t-field="message.author_id"/>
-                            <div t-field="message.date"/>
+                        <small class="pull-left text-muted text-left">
+                            <t t-field="message.author_id"/> on <t t-field="message.date"/>
                         </small>
                     </div>
                 </li>
             </ul>
-            <form id="comment" t-attf-action="/blog/#{blog_post.category_id.id}/#{blog_post.id}/post#post"
-                    method="POST" class="form-horizontal text-center"
-                    groups="group_website_blog_reply">
-                <textarea rows="4" placeholder="Your comment" class="col-md-7 form-control"></textarea>
-                <button type="submit" class="btn btn-default">Post your comment</button>
-            </form>
         </div>
     </template>