From 2c921133e7af89bba561bb481e1bf5ecd7eb42ef Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 16:11:12 +0530
Subject: [IMP] share: remove cancel button and improved view of wizard.

bzr revid: tpa@tinyerp.com-20120615104112-wm3ta76wum1181kc
---
 addons/share/wizard/share_wizard_view.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 1c9bb011432..486c207d751 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
                     <header>
-                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward"/>
-                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
                     </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
@@ -31,8 +30,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward"/>
-                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
                     </header>
                     <field name="user_type" invisible="1"/>
                     <field name="invite" invisible="1"/>
@@ -64,7 +62,6 @@
             <field name="arch" type="xml">
                 <form string="Access granted!" version="7.0">
                     <header>
-                        <button special="cancel" string="Close" icon='gtk-ok'/>
                         <field name="user_type" invisible="1"/>
                         <field name="access_mode" invisible="1"/>
                     </header>
-- 
cgit v1.2.3


From 1c4476e8b60dce0f627a1efde7af30ac5a4b7cb0 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Wed, 20 Jun 2012 13:07:12 +0530
Subject: [IMP]Improve wizard usability

bzr revid: tch@tinyerp.com-20120620073712-xql1mgekjyb7ufwv
---
 addons/share/wizard/share_wizard_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 486c207d751..47295d5caff 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -32,8 +32,10 @@
                     <header>
                         <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
                     </header>
-                    <field name="user_type" invisible="1"/>
-                    <field name="invite" invisible="1"/>
+                    <group>
+                        <field name="user_type" invisible="1"/>
+                        <field name="invite" invisible="1"/>
+                    </group>    
                     <group>
                         <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)">
                             <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
-- 
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/share/wizard/share_wizard_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 486c207d751..84aef1e37c0 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
                     <header>
-                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
@@ -30,7 +30,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </header>
                     <field name="user_type" invisible="1"/>
                     <field name="invite" invisible="1"/>
-- 
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/share/wizard/share_wizard_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index b62a05549a2..0e9f1b14800 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
                     <header>
-                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight"/>
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
                     </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
@@ -30,7 +30,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight"/>
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <field name="user_type" invisible="1"/>
-- 
cgit v1.2.3


From d9db3c44df2a183d5f9d9f34ba6f6e8d597e135f Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 25 Jun 2012 19:12:53 +0530
Subject: [REN] renamed e-mail, E-mail, E-Mail to email, Email

bzr revid: jam@tinyerp.com-20120625134253-sebauihl53zctcu0
---
 addons/share/wizard/share_wizard_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 1c9bb011432..311422f1c07 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -37,10 +37,10 @@
                     <field name="user_type" invisible="1"/>
                     <field name="invite" invisible="1"/>
                     <group>
-                        <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)">
+                        <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one email per line)">
                             <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
                         </group>
-                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one e-mail per line)">
+                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one email per line)">
                             <field name="email_1"/>
                             <field name="email_2"/>
                             <field name="email_3"/>
@@ -69,7 +69,7 @@
                         <field name="access_mode" invisible="1"/>
                     </header>
                     <group attrs="{'invisible':[('user_type','=','embedded')]}">
-                        <separator string="An e-mail notification with instructions has been sent to the following people:"/>
+                        <separator string="An email notification with instructions has been sent to the following people:"/>
                         <field name="result_line_ids" nolabel="1" mode="tree">
                             <tree string="Summary">
                                 <field name="login"/>
-- 
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/share/wizard/share_wizard_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 0e9f1b14800..bc6802ce6f0 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
                     <header>
-                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
+                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
@@ -30,7 +30,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight_editable" />
+                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <field name="user_type" invisible="1"/>
-- 
cgit v1.2.3


From 11224704cd3004fac1fba5a6abeb27d73bf41d1f Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 27 Jun 2012 19:15:30 +0530
Subject: [FIX] purchase*, sale, share, report_webkit, buton cancel

bzr revid: jam@tinyerp.com-20120627134530-141mzncfffkmjrom
---
 addons/share/wizard/share_wizard_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index bc6802ce6f0..246efa01f51 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
                     <header>
-                        <button name="go_step_1" string="Next" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
+                        <button name="go_step_1" string="Next" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
@@ -30,7 +32,9 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="go_step_2" string="Share" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty"  />
+                        <button name="go_step_2" string="Share" type="object" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <field name="user_type" invisible="1"/>
-- 
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/share/wizard/share_wizard_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 41f356ce583..ee5d4dd23b9 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
                     <header>
-                        <button name="go_step_1" string="Next" type="object" class="oe_highlight_on_dirty"/>
+                        <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
@@ -32,7 +32,7 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                     <header>
-                        <button name="go_step_2" string="Share" type="object" class="oe_highlight_on_dirty"/>
+                        <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-- 
cgit v1.2.3


From d8cb7505b921add6f68ddd69a56d356a7ebfc442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 29 Jun 2012 15:11:14 +0200
Subject: [IMP] Share wizard, share mode: cleaned form view.

bzr revid: tde@openerp.com-20120629131114-h5jldqhsdxhgcivf
---
 addons/share/wizard/share_wizard_view.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index ee5d4dd23b9..8c99c1b9f8e 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -39,17 +39,20 @@
                     <group>
                         <field name="user_type" invisible="1"/>
                         <field name="invite" invisible="1"/>
-                    </group>    
+                    </group>
                     <group>
-                        <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one email per line)">
-                            <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
+                        <group colspan="4" name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}"
+                            string="Share with these People (one email per line)">
+                            <field nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
                         </group>
-                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one email per line)">
+                        <group colspan="4" name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}"
+                            string="Share with these People (one email per line)">
                             <field name="email_1"/>
                             <field name="email_2"/>
                             <field name="email_3"/>
                         </group>
-                        <group attrs="{'invisible':[('user_type', '=', 'embedded')]}" string="Include an Optional Personal Message">
+                        <group colspan="4" attrs="{'invisible':[('user_type', '=', 'embedded')]}"
+                            string="Include an Optional Personal Message">
                             <field name="message" colspan="2" nolabel="1"/>
                         </group>
                         <group attrs="{'invisible':[('invite', '=', True)]}" string="Sharing Options">
@@ -71,8 +74,8 @@
                         <field name="user_type" invisible="1"/>
                         <field name="access_mode" invisible="1"/>
                     </header>
-                    <group attrs="{'invisible':[('user_type','=','embedded')]}">
-                        <separator string="An email notification with instructions has been sent to the following people:"/>
+                    <group attrs="{'invisible':[('user_type','=','embedded')]}"
+                        string="An email notification with instructions has been sent to the following people:">
                         <field name="result_line_ids" nolabel="1" mode="tree">
                             <tree string="Summary">
                                 <field name="login"/>
-- 
cgit v1.2.3


From a4a116d502fea8cf7e0323fc57d32c3a9321a977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 29 Jun 2012 15:21:42 +0200
Subject: [IMP] Share: embed mode: cleaned wizard form view.

bzr revid: tde@openerp.com-20120629132142-j2et1zdopayjzygr
---
 addons/share/wizard/share_wizard_view.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 8c99c1b9f8e..d2022d15ad9 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -88,14 +88,17 @@
                         </field>
                     </group>
                     <group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}">
-                        <separator string="Use this Link"/>
-                        <field name="embed_url"/>
-                        <separator string="Or insert the following code where you want to embed your documents"/>
-                        <group string="Options">
-                            <field name="embed_option_title" on_change="onchange_embed_options(embed_option_title, embed_option_search)"/>
-                            <field name="embed_option_search" on_change="onchange_embed_options(embed_option_title, embed_option_search)" attrs="{'invisible':[('access_mode','=','readonly')]}"/>
+                        <group string="Use this link">
+                            <field name="embed_url"/>
+                        </group>
+                        <group string="Or insert the following code where you want to embed your documents">
                             <field name="embed_code"/>
                         </group>
+                        <group string="Embedded code options">
+                            <field name="embed_option_title" on_change="onchange_embed_options(embed_option_title, embed_option_search)"/>
+                            <field name="embed_option_search" on_change="onchange_embed_options(embed_option_title, embed_option_search)"
+                                attrs="{'invisible':[('access_mode','=','readonly')]}"/>
+                        </group>
                     </group>
 
                 </form>
-- 
cgit v1.2.3


From b9081b29c1a94a81f7554700e048babd1d76ed66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 2 Jul 2012 11:51:33 +0200
Subject: [IMP] Invite/Share: hide email_lines when workign with (portal)
 groups.

bzr revid: tde@openerp.com-20120702095133-79986yd46zsyf94x
---
 addons/share/wizard/share_wizard_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/share/wizard/share_wizard_view.xml')

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index d2022d15ad9..58734caa25b 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -45,7 +45,7 @@
                             string="Share with these People (one email per line)">
                             <field nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
                         </group>
-                        <group colspan="4" name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}"
+                        <group colspan="4" name="email_lines" attrs="{'invisible':['|', ('invite', '!=', True), ('user_type', '!=', 'emails')]}"
                             string="Share with these People (one email per line)">
                             <field name="email_1"/>
                             <field name="email_2"/>
-- 
cgit v1.2.3