From 0d49f723eba97c7f81f657c4d768d8dcc21cc875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 23 Sep 2013 16:44:22 +0200
Subject: [PATCH] [CLEAN] website_blog: misc cleaning

bzr revid: tde@openerp.com-20130923144422-7vuocxo8bntvuana
---
 addons/website_blog/__openerp__.py            |  3 +--
 addons/website_blog/res_config.py             | 25 +++++++++++++++++--
 addons/website_blog/tests/test_controllers.py |  4 +--
 .../views/website_blog_templates.xml          | 14 +++--------
 addons/website_mail/tests/test_controllers.py |  4 +--
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/addons/website_blog/__openerp__.py b/addons/website_blog/__openerp__.py
index 8b38698dc35..431a95ac8ea 100644
--- a/addons/website_blog/__openerp__.py
+++ b/addons/website_blog/__openerp__.py
@@ -33,7 +33,6 @@ OpenERP Blog
     'depends': ['knowledge', 'website_mail'],
     'data': [
         'website_blog_data.xml',
-        'website_blog_demo.xml',
         'views/website_blog_classic.xml',
         'views/website_blog_templates.xml',
         'views/res_config.xml',
@@ -43,7 +42,7 @@ OpenERP Blog
         'security/website_mail.xml',
     ],
     'demo': [
-        # 'website_blog_demo.xml'
+        'website_blog_demo.xml'
     ],
     'test': [
         'test/document_page_test00.yml'
diff --git a/addons/website_blog/res_config.py b/addons/website_blog/res_config.py
index 1b6e02e691d..f88d953b0d3 100644
--- a/addons/website_blog/res_config.py
+++ b/addons/website_blog/res_config.py
@@ -1,4 +1,23 @@
 # -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 
 from openerp.osv import fields, osv
 
@@ -6,6 +25,8 @@ from openerp.osv import fields, osv
 class website_config_settings(osv.osv_memory):
     _inherit = 'website.config.settings'
     _columns = {
-        'group_website_mail_reply': fields.boolean('Visitors can reply on blogs',
-        		implied_group='website_mail.group_website_mail_reply'),
+        'group_website_mail_reply': fields.boolean(
+            'Visitors can reply on blogs',
+            implied_group='website_blog.group_website_mail_reply'
+        ),
     }
diff --git a/addons/website_blog/tests/test_controllers.py b/addons/website_blog/tests/test_controllers.py
index 60ffa5ac9a3..d1c28cab5af 100644
--- a/addons/website_blog/tests/test_controllers.py
+++ b/addons/website_blog/tests/test_controllers.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Business Applications
-#    Copyright (c) 2013-TODAY OpenERP S.A. <http://www.openerp.com>
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 45484e786a8..8edf269ab53 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -12,7 +12,7 @@
         </xpath>
     </template>
 
-    <!-- Blog Post -->
+    <!-- Blog Post Summary -->
     <template id="view_blog_post_short" name="Blog Post Short">
         <div class="media-body">
             <t t-call="website_mail.follow"><t t-set="object" t-value="blog_post"/></t>
@@ -31,6 +31,7 @@
         </div>
     </template>
 
+    <!-- Blog Post Complete -->
     <template id="view_blog_post" name="Blog Post">
         <div class="media">
             <div class="media-body">
@@ -124,17 +125,8 @@
         </t>
     </template>
 
-    <template id="blog_author" inherit_id="website_blog.index" inherit_option_id="website_blog.index" name="Author">
-<!--         <xpath expr="//div[@t-field='document_page.create_date']" position="before">
-            <div t-field="document_page.author_id"/>
-        </xpath>
-        <xpath expr="//div[@t-field='blog.create_date']" position="before">
-            <div t-field="blog.author_id"/>
-        </xpath> -->
-    </template>
-
     <!-- Option: archives -->
-    <template id="blog_history" inherit_id="website_blog.index" inherit_option_id="website_blog.index" name="History">
+    <template id="blog_history" inherit_id="website_blog.index" inherit_option_id="website_blog.index" name="Archives">
         <xpath expr="//div[@id='left_column']" position="inside">
             <h4>Archives</h4>
             <ul class="nav nav-pills nav-stacked">
diff --git a/addons/website_mail/tests/test_controllers.py b/addons/website_mail/tests/test_controllers.py
index 60ffa5ac9a3..d1c28cab5af 100644
--- a/addons/website_mail/tests/test_controllers.py
+++ b/addons/website_mail/tests/test_controllers.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Business Applications
-#    Copyright (c) 2013-TODAY OpenERP S.A. <http://www.openerp.com>
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as