summaryrefslogtreecommitdiff
path: root/addons/share/wizard/share_wizard_view.xml
diff options
context:
space:
mode:
authorVijaykumar Baladaniya <vba@tinyerp.com>2012-07-09 18:31:13 +0530
committerVijaykumar Baladaniya <vba@tinyerp.com>2012-07-09 18:31:13 +0530
commitbe2e95656aaa113addea2b510fcdcf2f890eaaa4 (patch)
treeabcb3dd4ef350a1b8ad0eaffdd2b9a1cb91521af /addons/share/wizard/share_wizard_view.xml
parentb982ea278b33132def3927417b7a854b98b5028a (diff)
parent3925f76ce85854e5d4834902a05f57bcfc5ace85 (diff)
[MERGE]merged with trunk-survey-layout-tta
bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg
Diffstat (limited to 'addons/share/wizard/share_wizard_view.xml')
-rw-r--r--addons/share/wizard/share_wizard_view.xml47
1 files changed, 28 insertions, 19 deletions
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 1c9bb011432..58734caa25b 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -9,8 +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"/>
- <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+ <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
+ 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."/>
@@ -31,21 +32,27 @@
<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" class="oe_highlight"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel" />
</header>
- <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)">
- <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
+ <field name="user_type" invisible="1"/>
+ <field name="invite" invisible="1"/>
+ </group>
+ <group>
+ <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 e-mail per line)">
+ <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"/>
<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">
@@ -64,12 +71,11 @@
<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>
- <group attrs="{'invisible':[('user_type','=','embedded')]}">
- <separator string="An e-mail 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"/>
@@ -82,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>