From 721a2d927fa0b2032644d1bfb23c51f3c0b68e56 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 18:03:48 +0530
Subject: [IMP] import_google: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615123348-0dy0c8hv1x6khxsl
---
 .../wizard/import_google_data_view.xml             | 24 ++++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'addons/import_google/wizard/import_google_data_view.xml')

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 7df067a643b..35ccedb0931 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -6,7 +6,10 @@
             <field name="model">synchronize.google.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import contacts from a google account">
+                <form string="Import contacts from a google account" version="7.0">
+                    <header>
+                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
                        <separator string="Import Options" colspan="4"/>
@@ -18,13 +21,6 @@
                             <field name="supplier"  colspan="4"/>
                        </group>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group colspan="2" col="2">
-                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+"/>
-                        </group>
-                    </group>
                 </form>
             </field>
         </record>
@@ -36,17 +32,13 @@
             <field name="model">synchronize.google.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Google Calendar Events">
+                <form string="Import Google Calendar Events" version="7.0">
+                    <header>
+                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group colspan="2" col="2">
-                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_google" string="_Import Events" type="object" icon="terp-calendar"/>
-                        </group>
-                    </group>
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3


From 660cc67256df5caeffd208c3c1a5efabcb637a05 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Wed, 20 Jun 2012 16:19:23 +0530
Subject: [IMP]Added highlight button on wizard

bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
---
 addons/import_google/wizard/import_google_data_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/import_google/wizard/import_google_data_view.xml')

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 35ccedb0931..8a9eed7fcb1 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_form_button_active_flow"/>
+                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight"/>
                     </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
@@ -34,7 +34,7 @@
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_form_button_active_flow"/>
+                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight"/>
                     </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
-- 
cgit v1.2.3


From 0e97cefe9e8247cac86a1c8342fb4f21ff8cb016 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Mon, 25 Jun 2012 15:39:01 +0530
Subject: [IMP]Improve wizard button

bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
---
 addons/import_google/wizard/import_google_data_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/import_google/wizard/import_google_data_view.xml')

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 8a9eed7fcb1..c9d5b8909b6 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight"/>
+                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight_editable" />
                     </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
@@ -34,7 +34,7 @@
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight"/>
+                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight_editable" />
                     </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
-- 
cgit v1.2.3


From 471037495c7572c0b1aac2b069a67a7c0e1f56f5 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Tue, 26 Jun 2012 12:01:19 +0530
Subject: [IMP]Apply css class flow on wizards buttons

bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
---
 addons/import_google/wizard/import_google_data_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/import_google/wizard/import_google_data_view.xml')

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index c9d5b8909b6..6b69f9130e8 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight_editable" />
+                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight_on_dirty"  />
                     </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
@@ -34,7 +34,7 @@
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight_editable" />
+                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight_on_dirty"  />
                     </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
-- 
cgit v1.2.3


From a4b94dbee6fe6ec1dd7aaa5f66186a2842d6a101 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 27 Jun 2012 19:49:17 +0530
Subject: [USA] add cancel button

bzr revid: rma@tinyerp.com-20120627141917-bs9bg2j3dasy9n1y
---
 addons/import_google/wizard/import_google_data_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/import_google/wizard/import_google_data_view.xml')

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 6b69f9130e8..ef2bd952a62 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+" class="oe_highlight_on_dirty"  />
+                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight_on_dirty"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
@@ -34,7 +36,9 @@
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Events" type="object" icon="terp-calendar" class="oe_highlight_on_dirty"  />
+                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight_on_dirty"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
-- 
cgit v1.2.3


From 5133bee1d529722cd690188d61d51debd2d91968 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 10:30:24 +0200
Subject: [FIX] in form views, replace class 'oe_highlight_on_dirty' by
 'oe_highlight'

bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
---
 addons/import_google/wizard/import_google_data_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/import_google/wizard/import_google_data_view.xml')

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index ef2bd952a62..aecc349de74 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
                         or 
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
@@ -36,7 +36,7 @@
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
                     <header>
-                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
                         or 
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-- 
cgit v1.2.3