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