pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] add cancel link button and remove the icon

Browse Source 
bzr revid: jam@tinyerp.com-20120627140953-9xoq7g8bkxc9300a
This commit is contained in:
Jigar Amin - OpenERP
2012-06-27 19:39:53 +05:30
parent 5977186c41
commit 30fa85448a
14 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/wizard/wizard_menu_view.xml
+3 -1
View File
@@ -8,7 +8,9 @@
<field name="arch" type="xml">
<form string="Create Menu" version="7.0">
<header>
<button name="menu_create" string="Create _Menu" type="object" class="oe_highlight_on_dirty" />
<button name="menu_create" string="Create _Menu" type="object" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="name"/>
openerp/addons/base/module/module_view.xml
+2 -2
View File
@@ -114,8 +114,8 @@
<field name="arch" type="xml">
<form string="Module" version="7.0">
<header>
<button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight_on_dirty" />
<button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight_on_dirty" />
<button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight"/>
<button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight"/>
<button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"
confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
<button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
openerp/addons/base/module/wizard/base_export_language_view.xml
+3 -1
View File
@@ -9,7 +9,9 @@
<field name="arch" type="xml">
<form string="Export Translations" version="7.0">
<header>
<button icon="gtk-ok" name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight_on_dirty" />
<button name="act_getfile" string="_Export" type="object" states="choose" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="8">
<group colspan="3">
openerp/addons/base/module/wizard/base_import_language_view.xml
+3 -1
View File
@@ -9,7 +9,9 @@
<field name="arch" type="xml">
<form string="Import Translation" version="7.0">
<header>
<button name="import_lang" string="_Import" type="object" icon="gtk-ok" class="oe_highlight_on_dirty" />
<button name="import_lang" string="_Import" type="object" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator string="Import Translation" colspan="2"/>
openerp/addons/base/module/wizard/base_language_install_view.xml
+3 -1
View File
@@ -9,7 +9,9 @@
<field name="arch" type="xml">
<form string="Load Official Translation" version="7.0">
<header>
<button name="lang_install" string="Load" type="object" icon="gtk-ok" states="init" class="oe_highlight_on_dirty" />
<button name="lang_install" string="Load" type="object" states="init" class="oe_highlight_on_dirty" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group colspan="4" col="8">
<group colspan="1">
openerp/addons/base/module/wizard/base_module_configuration_view.xml
+3
View File
@@ -8,6 +8,9 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="System Configuration Done" version="7.0">
<header>
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="All pending configuration wizards have been executed. You may restart individual wizards via the list of configuration wizards."/>
</form>
</field>
openerp/addons/base/module/wizard/base_module_import_view.xml
+5 -2
View File
@@ -9,8 +9,11 @@
<field name="arch" type="xml">
<form string="Import module" version="7.0">
<header>
<button name="importzip" string="Import module" type="object" icon="gtk-apply" states="init" class="oe_highlight_on_dirty" />
<button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward" states="done" class="oe_highlight_on_dirty" />
<button name="importzip" string="Import module" type="object" states="init" class="oe_highlight_on_dirty"/>
or
<button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="8">
<group colspan="3" col="1">
openerp/addons/base/module/wizard/base_module_scan_view.xml
+3 -1
View File
@@ -9,7 +9,9 @@
<field name="arch" type="xml">
<form string="Scan for new modules" version="7.0">
<header>
<button name="watch_dir" string="Check new modules" type="object" icon="gtk-ok" class="oe_highlight_on_dirty" />
<button name="watch_dir" string="Check new modules" type="object" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="This function will check if you installed new modules in the 'addons' path of your server installation."/>
</form>
openerp/addons/base/module/wizard/base_module_update_view.xml
+5 -2
View File
@@ -9,8 +9,11 @@
<field name="arch" type="xml">
<form string="Update Module List" version="7.0">
<header>
<button name="update_module" string="Update" type="object" icon="gtk-ok" states="init" class="oe_highlight_on_dirty" />
<button name="action_module_open" string="Open Modules" type="object" icon="gtk-go-forward" states="done" class="oe_highlight_on_dirty" />
<button name="update_module" string="Update" type="object" states="init" class="oe_highlight_on_dirty"/>
or
<button name="action_module_open" string="Open Modules" type="object" states="done" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="8">
<group colspan="3">
openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+3 -1
View File
@@ -9,7 +9,9 @@
<field name="arch" type="xml">
<form string="System Update" version="7.0">
<header>
<button name="upgrade_module" string="Update" type="object" icon="gtk-go-forward" class="oe_highlight_on_dirty" />
<button name="upgrade_module" string="Update" type="object" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<label string="Your system will be updated."/>
openerp/addons/base/module/wizard/base_update_translations_view.xml
+3 -1
View File
@@ -8,7 +8,9 @@
<field name="arch" type="xml">
<form string="Synchronize Terms" version="7.0">
<header>
<button icon="gtk-ok" name="act_update" string="Update" type="object" class="oe_highlight_on_dirty" />
<button name="act_update" string="Update" type="object" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="8">
<group colspan="3">
openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+7 -4
View File
@@ -40,11 +40,12 @@
<field name="check_opw"/>
</group>
<group col="2" colspan="3">
<button name="check_validity" icon="camera_test.png
" string="Validate" type="object"
<button name="check_validity" string="Validate" type="object"
attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/>
<button name="check_validity" icon="camera_test.png" string="Refresh Validation Dates" type="object"
<button name="check_validity" string="Refresh Validation Dates" type="object"
attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</group>
</group>
</sheet>
@@ -95,7 +96,9 @@
<field name="arch" type="xml">
<form string="Register a Contract" version="7.0">
<header>
<button name="action_validate" string="Register" type="object" icon="gtk-apply" states="draft" class="oe_highlight_on_dirty" />
<button name="action_validate" string="Register" type="object" states="draft" class="oe_highlight_on_dirty" />
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group colspan="4" col="8">
<group colspan="1">
openerp/addons/base/res/res_config.xml
+8 -4
View File
@@ -8,9 +8,9 @@
<form version="7.0">
<header>
<button name="action_next" type="object"
string="Apply" icon="gtk-go-forward" class="oe_highlight_on_dirty" />
string="Apply" class="oe_highlight_on_dirty" />
<button name="action_skip" type="object" special="cancel"
string="Cancel" icon="gtk-jump-to"/>
string="Cancel" class="oe_link"/>
</header>
<group string="res_config_contents"/>
</form>
@@ -25,7 +25,9 @@
<form string="Next Configuration Step" version="7.0">
<header>
<button name="action_next" type="object"
string="Continue" icon="gtk-go-forward" class="oe_highlight_on_dirty" />
string="Continue" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="note"/>
@@ -41,7 +43,9 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="action_next" icon="gtk-go-forward" type="object" string="Install Modules" class="oe_highlight_on_dirty" />
<button name="action_next" type="object" string="Install Modules" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<separator string="title" colspan="4"/>
openerp/addons/base/res/res_widget_view.xml
+3 -1
View File
@@ -89,7 +89,9 @@
<field name="arch" type="xml">
<form string="Widget Wizard" col="4" version="7.0">
<header>
<button name="res_widget_add" string="Add" type="object" class="oe_highlight_on_dirty" />
<button name="res_widget_add" string="Add" type="object" class="oe_highlight_on_dirty"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="widgets_list"/>