[IMP] drop zone for call to actions zones

bzr revid: fp@tinyerp.com-20140309185847-d4xptw5jqw8m2yio

diff --git a/addons/website_forum/models/website_forum.py b/addons/website_forum/models/website_forum.py
index f67ed82..8ef9a67 100644 (file)
--- a/addons/website_forum/models/website_forum.py
+++ b/addons/website_forum/models/website_forum.py
@@ -35,8 +35,8 @@ class Forum(osv.Model):
     _inherit = ['mail.thread', 'website.seo.metadata']
     _columns = {
         'name': fields.char('Name', required=True, translate=True),
-        'faq': fields.html('FAQ'),
-        'right_column': fields.html('FAQ'),
+        'faq': fields.html('Guidelines'),
+        'right_column': fields.html('Right Column'),
     }
     def _get_default_faq(self, cr, uid, context={}):
         fname = openerp.modules.get_module_resource('website_forum', 'data', 'forum_default_faq.html')
@@ -45,7 +45,17 @@ class Forum(osv.Model):
         return False
 
     _defaults = {
-        'faq': _get_default_faq
+        'faq': _get_default_faq,
+        'right_column': """<div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">About This Forum</h3>
+                </div>
+                <div class="panel-body">
+                    This community is for professional and enthusiast about our
+                    products and services.<br/>
+                    <a t-attf-href="/forum/1/faq" class="fa fa-arrow-right"> Read Guidelines</a>
+                </div>
+            </div>"""
     }
 
 class Post(osv.Model):

diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 38f5886..4b67284 100644 (file)
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -119,21 +119,11 @@
                             <t t-raw="0"/>
                         </div><div class="col-sm-3" id="right-column">
                             <a class="btn btn-primary btn-lg btn-block mb16" t-attf-href="/forum/#{ slug(forum) }/ask">Ask a Question</a>
-
-                            <div class="panel panel-default">
-                                <div class="panel-heading">
-                                    <h3 class="panel-title">About This Forum</h3>
-                                </div>
-                                <div class="panel-body">
-                                    This community is for professional and enthusiast about our
-                                    products and services.<br/>
-                                    <a t-attf-href="/forum/#{ slug(forum) }/faq" class="fa fa-arrow-right"> Read Guidelines</a>
-                                </div>
-                            </div>
-
+                            <div t-field="forum.right_column"/>
                         </div>
                     </div>
                 </div>
+                <div class="oe_structure"/>
             </t>
         </template>
 
@@ -411,9 +401,9 @@
                 <div t-if="not answer_done">
                     <t t-call="website_forum.post_answer"/>
                 </div>
-                <div t-if="answer_done">
-                    <a class="btn btn-primary mb16" t-attf-href="/forum/#{ slug(forum) }/question/#{ question.id }/editanswer">Edit Your Previous Answer</a>
-                    <span style="margin-bottom: 10px;">(only one answer per question is allowed)</span>
+                <div t-if="answer_done" class="mb16">
+                    <a class="btn btn-primary" t-attf-href="/forum/#{ slug(forum) }/question/#{ question.id }/editanswer">Edit Your Previous Answer</a>
+                    <span class="text-muted">(only one answer per question is allowed)</span>
                 </div>
             </t>
         </template>