diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
| commit | 6fe94bd4bc076ad659dffe453c7b057e9340b54d (patch) | |
| tree | d673f7a2b25ec1f01307c45f081ed8c9fe27babf /addons/import_google | |
| parent | a642b36339ac6628b1a937bbf0d2750cc14fcdd5 (diff) | |
| parent | 37601079a987b0b20f22fff8963d22b1440b78b4 (diff) | |
[MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
Diffstat (limited to 'addons/import_google')
| -rw-r--r-- | addons/import_google/wizard/google_import_message_view.xml | 3 | ||||
| -rw-r--r-- | addons/import_google/wizard/import_google_data_view.xml | 28 |
2 files changed, 12 insertions, 19 deletions
diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml index 215de9ba59c..250239ea10c 100644 --- a/addons/import_google/wizard/google_import_message_view.xml +++ b/addons/import_google/wizard/google_import_message_view.xml @@ -8,9 +8,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Import Google Data" version="7.0"> - <header> - <button icon="gtk-ok" special="cancel" string="_Ok"/> - </header> <group> <field name='name'/> </group> diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml index d2873a8d3f9..2968b009a51 100644 --- a/addons/import_google/wizard/import_google_data_view.xml +++ b/addons/import_google/wizard/import_google_data_view.xml @@ -6,7 +6,12 @@ <field name="model">synchronize.google.import</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Import contacts from a google account"> + <form string="Import contacts from a google account" version="7.0"> + <header> + <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight" /> + or + <button string="Cancel" class="oe_link" special="cancel" /> + </header> <group colspan="4" col="4" width="430"> <field name="group_name" colspan="4"/> <newline/> @@ -16,13 +21,6 @@ <field name="supplier" colspan="4"/> </group> </group> - <separator string="" colspan="4"/> - <group colspan="4" col="4"> - <group colspan="2" col="2"> - <button special="cancel" string="_Cancel" icon="gtk-cancel"/> - <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+"/> - </group> - </group> </form> </field> </record> @@ -34,17 +32,15 @@ <field name="model">synchronize.google.import</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Import Google Calendar Events"> + <form string="Import Google Calendar Events" version="7.0"> + <header> + <button name="import_google" string="_Import Events" type="object" class="oe_highlight" /> + or + <button string="Cancel" class="oe_link" special="cancel" /> + </header> <group colspan="4" col="4" width="320"> <field name="calendar_name" /> </group> - <separator string="" colspan="4"/> - <group colspan="4" col="4"> - <group colspan="2" col="2"> - <button special="cancel" string="_Cancel" icon="gtk-cancel"/> - <button name="import_google" string="_Import Events" type="object" icon="terp-calendar"/> - </group> - </group> </form> </field> </record> |