diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2012-11-14 10:47:51 +0100 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2012-11-14 10:47:51 +0100 |
| commit | 112152b5d866a2315eaf661e7920c6c462840819 (patch) | |
| tree | a7b9a343c74f0570242796d5d9eb9d5b62573828 /addons/plugin_thunderbird/plugin_thunderbird.xml | |
| parent | e46502580a5c9e19c31e15dd308e99307bbb68ed (diff) | |
| parent | 9d8a2ea8e9d75bcc284a19e10173314b80d78eda (diff) | |
[MERGE]merge with trunk
bzr revid: csn@openerp.com-20121114094751-iz3yf6bj73e5u2pa
Diffstat (limited to 'addons/plugin_thunderbird/plugin_thunderbird.xml')
| -rw-r--r-- | addons/plugin_thunderbird/plugin_thunderbird.xml | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index 1adb4fa5eda..3774a369437 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -4,32 +4,34 @@ <record id="view_thunderbird_installer" model="ir.ui.view"> <field name="name">plugin_thunderbird.installer.view</field> <field name="model">plugin_thunderbird.installer</field> - <field name="type">form</field> <field name="inherit_id" ref="base.res_config_installer"/> <field name="arch" type="xml"> <data> <form position="attributes"> <attribute name="string">Install Thunderbird Plug-In</attribute> </form> - <xpath expr="//footer" position="replace"/> + <xpath expr="//footer" position="replace"> + <footer> + <button string="Close" special="Cancel" class="oe_highlight"/> + </footer> + </xpath> <xpath expr="//separator[@string='title']" position="after"> <group> <field name="thunderbird" invisible="1"/> <field name="plugin_name" invisible="1"/> <field name="plugin_file" filename="plugin_name" widget="url"/> - <field name="pdf_file" widget="url"/> </group> <separator string="Installation and Configuration Steps"/> - <p>Thunderbird plugin installation:</p> - <ul> - <li>1. Save the Thunderbird plug-in.</li> - <li>2. From the Thunderbird menubar: Tools > Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li> - <li>3. Select the plug-in (the file named openerp_plugin.xpi).</li> - <li>4. Click "Install Now".</li> - <li>5. Restart Thunderbird.</li> - <li>6. From the Thunderbird menubar: OpenERP -> Configuration.</li> - <li>7. Configure your openerp server.</li> - </ul> + <p>Thunderbird plug-in installation:</p> + <ol> + <li> Save the Thunderbird plug-in.</li> + <li> From the Thunderbird menubar: Tools > Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li> + <li> Select the plug-in (the file named openerp_plugin.xpi).</li> + <li> Click "Install Now".</li> + <li> Restart Thunderbird.</li> + <li> From the Thunderbird menubar: OpenERP -> Configuration.</li> + <li> Configure your openerp server.</li> + </ol> </xpath> <separator string="title" position="attributes"> <attribute name="string"></attribute> @@ -52,17 +54,16 @@ <record id="view_config_thunderbird_installer" model="ir.ui.view"> <field name="name">Sales Application</field> <field name="model">sale.config.settings</field> - <field name="type">form</field> <field name="inherit_id" ref="base_setup.view_sale_config_settings"/> <field name="arch" type="xml"> - <field name="module_plugin_thunderbird" version="7.0" position="replace"> - <label for="module_plugin_thunderbird"/> + <div name="module_plugin_thunderbird" version="7.0" position="replace"> <div> - <field name="module_plugin_thunderbird"/> - <button name="%(action_thunderbird_installer)d" type="action" string="Configure" icon="gtk-execute" - attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}"/> + <field name="module_plugin_thunderbird" class="oe_inline"/> + <label for="module_plugin_thunderbird"/> + <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plug-in" icon="gtk-execute" + attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/> </div> - </field> + </div> </field> </record> |