From 910c2657a9b8c682650913dac93f72efc2211e4a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 19 Nov 2013 11:30:42 +0100
Subject: [IMP] website: add a group_website_publisher to Display Editor Bar on
 Website and other editable option

bzr revid: chm@openerp.com-20131119103042-stdyd6r00e1zgli5
---
 addons/website/data/website_data.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/website/data/website_data.xml')

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index d8c8a3df094..2e4f348a669 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -40,6 +40,11 @@
             <field name="users" eval="[(4, ref('public_user'))]"/>
         </record>
 
+        <record id="base.group_website_publisher" model="res.groups">
+            <field name="name">Display Editor Bar on Website</field>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+
         <record id="action_module_website" model="ir.actions.act_window">
             <field name="name">Website Apps</field>
             <field name="res_model">ir.module.module</field>
-- 
cgit v1.2.3


From 176a78e16147baff080a166c4bfe551ad5df6b88 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 19 Nov 2013 14:57:17 +0100
Subject: [IMP] website: add website_designer group and access rules to edit
 qweb view

bzr revid: chm@openerp.com-20131119135717-6sv54lpm5smybsib
---
 addons/website/data/website_data.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'addons/website/data/website_data.xml')

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 2e4f348a669..cd7d64d3b34 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -45,6 +45,13 @@
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
+        <!-- Access rules to edit ir.ui.view with qWeb type -->
+        <record id="base.group_website_designer" model="res.groups">
+            <field name="name">Manage Website and qWeb view</field>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_website_publisher'))]"/>
+        </record>
+
         <record id="action_module_website" model="ir.actions.act_window">
             <field name="name">Website Apps</field>
             <field name="res_model">ir.module.module</field>
-- 
cgit v1.2.3


From 64c70ddf3303b4ecbe09d474e6c71090b2cb2d82 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 19 Nov 2013 15:57:14 +0100
Subject: [IMP] website: group website_publisher and website_designer grouped
 in the user form

bzr revid: chm@openerp.com-20131119145714-ot106cxrv0w1qfi8
---
 addons/website/data/website_data.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/website/data/website_data.xml')

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index cd7d64d3b34..5ab70bf76be 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -42,7 +42,7 @@
 
         <record id="base.group_website_publisher" model="res.groups">
             <field name="name">Display Editor Bar on Website</field>
-            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+            <field name="category_id" ref="base.module_category_website"/>
         </record>
 
         <!-- Access rules to edit ir.ui.view with qWeb type -->
@@ -50,6 +50,7 @@
             <field name="name">Manage Website and qWeb view</field>
             <field name="users" eval="[(4, ref('base.user_root'))]"/>
             <field name="implied_ids" eval="[(4, ref('base.group_website_publisher'))]"/>
+            <field name="category_id" ref="base.module_category_website"/>
         </record>
 
         <record id="action_module_website" model="ir.actions.act_window">
-- 
cgit v1.2.3


From 56eb2c06078e82eee1a86869857d6ce85f0b864a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 29 Nov 2013 22:32:29 +0100
Subject: [IMP] transparent background on impage

bzr revid: fp@tinyerp.com-20131129213229-ctp1sne7r1ioa7w1
---
 addons/website/data/website_data.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/data/website_data.xml')

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 5ab70bf76be..4274bcfb63d 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -130,10 +130,10 @@
 
         <record model="ir.attachment">
             <field name="name">gears</field>
-            <field name="datas_fname">gears.jpg</field>
+            <field name="datas_fname">gears.png</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
-            <field name="url">/website/static/src/img/library/gears.jpg</field>
+            <field name="url">/website/static/src/img/library/gears.png</field>
         </record>
 
         <record model="ir.attachment">
-- 
cgit v1.2.3


From d4fc95f1fe3fa116cf114cc3bc6f5d353f8c2351 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 30 Nov 2013 21:58:34 +0100
Subject: [FIX] small fixes

bzr revid: fp@tinyerp.com-20131130205834-ilds41gcktv7vchg
---
 addons/website/data/website_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/data/website_data.xml')

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 4274bcfb63d..d457fdafa96 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -37,7 +37,7 @@
         </record>
 
         <record id="base.group_public" model="res.groups">
-            <field name="users" eval="[(4, ref('public_user'))]"/>
+            <field name="users" eval="[(4, ref('website.public_user'))]"/>
         </record>
 
         <record id="base.group_website_publisher" model="res.groups">
-- 
cgit v1.2.3


From a7738ab2eaf409892c4221fc233ed1bf24a311b8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 3 Dec 2013 13:09:10 +0100
Subject: [IMP] Reorder menu

bzr revid: fme@openerp.com-20131203120910-yv82gwref4uikn7b
---
 addons/website/data/website_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/data/website_data.xml')

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index d457fdafa96..d1d9c0b6cb5 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -23,7 +23,7 @@
             <field name="name">Contact us</field>
             <field name="url">/page/website.contactus</field>
             <field name="parent_id" ref="website.main_menu"/>
-            <field name="sequence" type="int">20</field>
+            <field name="sequence" type="int">60</field>
         </record>
 
         <record id="public_user" model="res.users">
-- 
cgit v1.2.3


From 64794a8c3b77453e79686861431c2147ce857563 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 12 Dec 2013 10:59:50 +0100
Subject: [FIX] Restore tutorial on module install

bzr revid: ddm@openerp.com-20131212095950-3675vfd0tjpzlsug
---
 addons/website/data/website_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/data/website_data.xml')

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index d1d9c0b6cb5..9e33a43b5d2 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -72,7 +72,7 @@
         </record>
         <record id="action_website_tutorial" model="ir.actions.act_url">
             <field name="name">Website With Tutorial</field>
-            <field name="url">/?banner-tutorial=true</field>
+            <field name="url">/?tutorial.banner=true</field>
             <field name="target">self</field>
         </record>
 
-- 
cgit v1.2.3


From 39c5b09e6e0125e30977fe7160518d2baa9c165a Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 23 Dec 2013 16:25:03 +0100
Subject: [IMP] Banner tour automated test

bzr revid: ddm@openerp.com-20131223152503-saqpy0d8vgvg9p20
---
 addons/website/data/website_data.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/website/data/website_data.xml')

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 9e33a43b5d2..bc387b609ae 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -75,6 +75,11 @@
             <field name="url">/?tutorial.banner=true</field>
             <field name="target">self</field>
         </record>
+        <record id="action_website_homepage" model="ir.actions.act_url">
+            <field name="name">Website Homepage</field>
+            <field name="url">/page/website.homepage</field>
+            <field name="target">self</field>
+        </record>
 
         <record id="menu_website" model="ir.ui.menu">
             <field name="name">Website</field>
-- 
cgit v1.2.3