[IMP] form view, removed project_planning

bzr revid: fp@tinyerp.com-20120609203127-hzdb9tuua0dmydh0

1 files changed, 60 insertions, 61 deletions

diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 6008d45e58a..e6254264e1f 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -7,17 +7,18 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sharing: preparation">
-                    <separator colspan="4"
-                        string="Please select the action that opens the screen containing the data you want to share."/>
-                    <field name="action_id" colspan="4"/>
-                    <separator colspan="4"
-                        string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
-                    <field name="domain"/>
-                    <separator colspan="4"/>
-                    <group colspan="4">
+                <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" colspan="1" type="object" icon="gtk-go-forward"/>
+                    <header>
+                    <separator
+                        string="Please select the action that opens the screen containing the data you want to share."/>
+                    <group>
+                        <field name="action_id"/>
+                        <label colspan="2"
+                            string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
+                        <field name="domain"/>
                     </group>
                 </form>
             </field>
@@ -28,32 +29,29 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <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'/>
+                    <header>
                     <field name="user_type" invisible="1"/>
                     <field name="invite" invisible="1"/>
-                    <group colspan="4" name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}">
-                        <separator colspan="4" string="Share with these People (one e-mail per line)"/>
-                        <field colspan="4" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
-                    </group>
-                    <group colspan="4" col="2" name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}">
-                        <separator colspan="4" string="Share with these People (one e-mail per line)"/>
-                        <field name="email_1"/>
-                        <field name="email_2"/>
-                        <field name="email_3"/>
-                    </group>
-                    <group colspan="4" col="4" attrs="{'invisible':[('user_type', '=', 'embedded')]}">
-                        <separator colspan="4" string="Include an Optional Personal Message"/>
-                        <field name="message" colspan="4" nolabel="1"/>
-                    </group>
-                    <group colspan="4" col="4" attrs="{'invisible':[('invite', '=', True)]}">
-                        <separator colspan="4" string="Sharing Options"/>
-                        <field name="name" colspan="4"/>
-                        <field name="access_mode" colspan="4"/>
-                    </group>
-                    <separator colspan="4"/>
-                    <group colspan="4">
-                        <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                        <button name="go_step_2" string="Share" colspan="1" type="object" icon="gtk-go-forward"/>
+                    <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)]}"/>
+                        </group>
+                        <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one e-mail 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">
+                            <field name="message" colspan="2" nolabel="1"/>
+                        </group>
+                        <group attrs="{'invisible':[('invite', '=', True)]}" string="Sharing Options">
+                            <field name="name"/>
+                            <field name="access_mode"/>
+                        </group>
                     </group>
                 </form>
             </field>
@@ -64,35 +62,36 @@
             <field name="model">share.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Access granted!">
-                  <field name="user_type" invisible="1"/>
-                  <field name="access_mode" invisible="1"/>
-		          <group colspan="4" col="1" attrs="{'invisible':[('user_type','=','embedded')]}">
-                    <separator string="An e-mail 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"/>
-                        </tree>
-                        <form string="Access info">
-                            <field name="login"/>
-                        </form>
-		            </field>
-                  </group>
-		          <group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}">
-		            <separator string="Use this Link"/>
-		            <field name="embed_url" nolabel="1"/>
-		            <separator string="Or insert the following code where you want to embed your documents"/>
-		            <group col="4" 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>
-		            <field name="embed_code" nolabel="1"/>
-                  </group>
-
-                    <separator colspan="4"/>
-                    <group colspan="4">
+                <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>
+                    <group attrs="{'invisible':[('user_type','=','embedded')]}">
+                        <separator string="An e-mail 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"/>
+                            </tree>
+                            <form string="Access info" version="7.0">
+                                <group>
+                                    <field name="login"/>
+                                </group>
+                            </form>
+                        </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')]}"/>
+                            <field name="embed_code"/>
+                        </group>
+                    </group>
+
                 </form>
             </field>
         </record>