diff options
| author | Alexis de Lattre <alexis@via.ecp.fr> | 2012-11-29 23:26:45 +0100 |
|---|---|---|
| committer | Alexis de Lattre <alexis@via.ecp.fr> | 2012-11-29 23:26:45 +0100 |
| commit | cad4abe56ceba2ebed236efa86755a48a61c1003 (patch) | |
| tree | b877f8451589bfd0bfdb5254415520c844e554fe /addons/plugin_thunderbird/plugin_thunderbird.xml | |
| parent | 41c31b08faea8df4a4b7a4494728af6c1f67585f (diff) | |
| parent | 69cb769ec5d70f80eaad3391b26870054f394145 (diff) | |
Merge with addons/trunk revno 8168.
Adapt demo data to the rename of partner XML IDs in server/trunk.
bzr revid: alexis@via.ecp.fr-20121129222645-lm5ujxf4a1a83aoz
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..31fa27a644f 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" class="oe_link" special="cancel" /> + </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> |