Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-tools-tpa into
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-wiz-remove-btn-tools-tpa/+merge/110731
[IMP] remove cancel button and improved view of wizard in following modules.
--> membership
--> marketing
--> mail
--> lunch
--> report_webkit
--> share
--> wiki
--> survey
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-wiz-remove-btn-tools-tpa/+merge/110731
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn.
=== modified file 'email_template/wizard/email_compose_message_view.xml'
--- email_template/wizard/email_compose_message_view.xml 2011-09-08 17:37:52 +0000
+++ email_template/wizard/email_compose_message_view.xml 2012-06-18 06:21:39 +0000
@@ -9,18 +9,17 @@
<field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
<field name="arch" type="xml">
<data>
- <xpath expr="//label[@name='placeholder']" position="before">
+ <xpath expr="//form/header/button" position="before">
+ <field name="use_template" invisible="1"/>
+ <button icon="gtk-paste" type="object" name="template_toggle"
+ string="" help="Use a message template" />
+ <button icon="gtk-save" type="object" name="save_as_template"
+ string="" help="Save as a new template"/>
+ </xpath>
+ <xpath expr="//form/notebook" position="after">
<group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
<field name="template_id" colspan="3"
on_change="on_change_template(use_template, template_id, email_from, email_to, context)"/>
- <label string="" name="flexspace" colspan="1"/>
- </group>
- <group colspan="1" col="6">
- <field name="use_template" invisible="1"/>
- <button icon="gtk-paste" type="object" name="template_toggle"
- string="" help="Use a message template" colspan="1"/>
- <button icon="gtk-save" type="object" name="save_as_template"
- string="" help="Save as a new template" colspan="1"/>
</group>
</xpath>
</data>
=== modified file 'lunch/wizard/lunch_cashbox_clean_view.xml'
--- lunch/wizard/lunch_cashbox_clean_view.xml 2012-06-09 14:39:04 +0000
+++ lunch/wizard/lunch_cashbox_clean_view.xml 2012-06-18 06:21:39 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Reset cashbox" version="7.0">
<header>
- <button icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="No"/>
+ <button icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object" class="oe_form_button_active_flow"/>
</header>
<label string="Are you sure you want to reset this cashbox ?"/>
</form>
=== modified file 'lunch/wizard/lunch_order_cancel_view.xml'
--- lunch/wizard/lunch_order_cancel_view.xml 2012-06-09 14:39:04 +0000
+++ lunch/wizard/lunch_order_cancel_view.xml 2012-06-18 06:21:39 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Cancel Order" version="7.0">
<header>
- <button icon="gtk-ok" name="cancel" string="Yes" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="No"/>
+ <button icon="gtk-ok" name="cancel" string="Yes" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4" >
<label string="Are you sure you want to cancel this order ?"/>
=== modified file 'lunch/wizard/lunch_order_confirm_view.xml'
--- lunch/wizard/lunch_order_confirm_view.xml 2012-06-09 14:39:04 +0000
+++ lunch/wizard/lunch_order_confirm_view.xml 2012-06-18 06:21:39 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Confirm" version="7.0">
<header>
- <button icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+ <button icon="gtk-ok" name="confirm" string="Confirm Order" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<separator string="Orders Confirmation" colspan="4"/>
=== modified file 'mail/wizard/mail_compose_message_view.xml'
--- mail/wizard/mail_compose_message_view.xml 2012-04-02 05:34:27 +0000
+++ mail/wizard/mail_compose_message_view.xml 2012-06-18 06:21:39 +0000
@@ -6,7 +6,10 @@
<field name="model">mail.compose.message</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Compose Email">
+ <form string="Compose Email" version="7.0">
+ <header>
+ <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_form_button_active_flow"/>
+ </header>
<group col="6" colspan="4">
<field name="model" invisible="1"/>
<field name="res_id" invisible="1"/>
@@ -28,11 +31,6 @@
<field name="attachment_ids" colspan="4" nolabel="1"/>
</page>
</notebook>
- <group col="4" colspan="4">
- <label string="" name="placeholder" colspan="1"/>
- <button icon="gtk-close" special="cancel" string="Cancel"/>
- <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
- </group>
</form>
</field>
</record>
=== modified file 'marketing/res_config_view.xml'
--- marketing/res_config_view.xml 2012-06-09 14:39:04 +0000
+++ marketing/res_config_view.xml 2012-06-18 06:21:39 +0000
@@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Configure Marketing" version="7.0">
<header>
- <button string="Apply" type="object" name="execute"/>
- <button string="Cancel" special="cancel"/>
+ <button string="Apply" type="object" name="execute" class="oe_form_button_active_flow"/>
</header>
<sheet>
<group col="4" string="Campaigns">
=== modified file 'membership/wizard/membership_invoice_view.xml'
--- membership/wizard/membership_invoice_view.xml 2012-06-09 22:28:49 +0000
+++ membership/wizard/membership_invoice_view.xml 2012-06-18 06:21:39 +0000
@@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Membership Invoice" version="7.0">
<header>
- <button icon="gtk-apply" string="Join" name="membership_invoice" type="object"/>
- <button icon="gtk-close" special="cancel" string="Close"/>
+ <button icon="gtk-apply" string="Join" name="membership_invoice" type="object" class="oe_form_button_active_flow"/>
</header>
<group>
<field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
=== modified file 'report_webkit/wizard/report_webkit_actions_view.xml'
--- report_webkit/wizard/report_webkit_actions_view.xml 2012-06-09 22:28:49 +0000
+++ report_webkit/wizard/report_webkit_actions_view.xml 2012-06-18 06:21:39 +0000
@@ -9,8 +9,7 @@
<field name="arch" type="xml">
<form string="Add Print Buttons" col="4" version="7.0">
<header>
- <button name="do_action" type="object" string="_Ok" icon="gtk-ok" />
- <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+ <button name="do_action" type="object" string="_Ok" icon="gtk-ok" class="oe_form_button_active_flow"/>
</header>
<group>
<field name="print_button"/>
=== modified file 'share/wizard/share_wizard_view.xml'
--- share/wizard/share_wizard_view.xml 2012-06-09 22:28:49 +0000
+++ share/wizard/share_wizard_view.xml 2012-06-18 06:21:39 +0000
@@ -9,8 +9,7 @@
<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" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
</header>
<separator
string="Please select the action that opens the screen containing the data you want to share."/>
@@ -31,8 +30,7 @@
<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" icon="gtk-go-forward" class="oe_form_button_active_flow"/>
</header>
<field name="user_type" invisible="1"/>
<field name="invite" invisible="1"/>
@@ -64,7 +62,6 @@
<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>
=== modified file 'survey/wizard/survey_browse_answer.xml'
--- survey/wizard/survey_browse_answer.xml 2012-06-09 22:12:48 +0000
+++ survey/wizard/survey_browse_answer.xml 2012-06-18 06:21:39 +0000
@@ -13,8 +13,7 @@
<field name="arch" type="xml">
<form string="Survey" version="7.0">
<header>
- <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+ <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<separator colspan="4" string = "Select Survey and Related Answer"/>
=== modified file 'survey/wizard/survey_print.xml'
--- survey/wizard/survey_print.xml 2012-06-09 22:12:48 +0000
+++ survey/wizard/survey_print.xml 2012-06-18 06:21:39 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Survey Print" version="7.0">
<header>
- <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
- <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+ <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<separator string="Survey" colspan="4"/>
=== modified file 'survey/wizard/survey_print_answer.xml'
--- survey/wizard/survey_print_answer.xml 2012-06-09 22:12:48 +0000
+++ survey/wizard/survey_print_answer.xml 2012-06-18 06:21:39 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Print Answer" version="7.0">
<header>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="gtk-print" name="action_next" string="Print" type="object"/>
+ <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<separator string="Answer" colspan="4"/>
=== modified file 'survey/wizard/survey_print_statistics.xml'
--- survey/wizard/survey_print_statistics.xml 2012-06-09 22:12:48 +0000
+++ survey/wizard/survey_print_statistics.xml 2012-06-18 06:21:39 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Survey Print Statistics" version="7.0">
<header>
- <button icon="gtk-print" name="action_next" string="Print" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+ <button icon="gtk-print" name="action_next" string="Print" type="object" class="oe_form_button_active_flow"/>
</header>
<field name="survey_ids"/>
</form>
=== modified file 'survey/wizard/survey_selection.xml'
--- survey/wizard/survey_selection.xml 2012-06-09 22:12:48 +0000
+++ survey/wizard/survey_selection.xml 2012-06-18 06:21:39 +0000
@@ -12,8 +12,7 @@
<field name="arch" type="xml">
<form string="Survey" version="7.0">
<header>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
+ <button icon="gtk-go-forward" name="action_next" string="Start" type="object" class="oe_form_button_active_flow"/>
</header>
<group string="Select Survey">
<field name="survey_id" on_change="on_change_survey(survey_id)"/>
=== modified file 'survey/wizard/survey_send_invitation.xml'
--- survey/wizard/survey_send_invitation.xml 2012-06-09 22:28:49 +0000
+++ survey/wizard/survey_send_invitation.xml 2012-06-18 06:21:39 +0000
@@ -11,8 +11,7 @@
<field name="arch" type="xml">
<form string="Send Invitation" version="7.0">
<header>
- <button icon="gtk-go-forward" name="action_send" string="_Send" type="object"/>
- <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+ <button icon="gtk-go-forward" name="action_send" string="_Send" type="object" class="oe_form_button_active_flow"/>
</header>
<group col="4">
<separator string="Select Partner" colspan="4"/>
@@ -55,9 +54,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="User creation" version="7.0">
- <header>
- <button icon="gtk-ok" special="cancel" string="_Ok"/>
- </header>
<group string="Results :">
<field name="note"/>
</group>
=== modified file 'wiki/wizard/wiki_create_menu_view.xml'
--- wiki/wizard/wiki_create_menu_view.xml 2012-06-09 22:12:48 +0000
+++ wiki/wizard/wiki_create_menu_view.xml 2012-06-18 06:21:39 +0000
@@ -9,15 +9,14 @@
<field name="model">wiki.create.menu</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Create Menu">
- <separator string="Menu Information" colspan="4" />
+ <form string="Create Menu" version="7.0">
+ <header>
+ <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_form_button_active_flow"/>
+ </header>
+ <separator string="Menu Information" colspan="4" />
<field name="menu_name" />
<field name="menu_parent_id" />
- <separator string="" colspan="4" />
- <label string="" colspan="2" />
- <button special="cancel" string="Cancel" />
- <button name="wiki_menu_create" string="Create Menu" type="object"/>
- </form>
+ </form>
</field>
</record>
=== modified file 'wiki/wizard/wiki_make_index_view.xml'
--- wiki/wizard/wiki_make_index_view.xml 2012-06-09 22:12:48 +0000
+++ wiki/wizard/wiki_make_index_view.xml 2012-06-18 06:21:39 +0000
@@ -9,16 +9,13 @@
<field name="model">wiki.make.index</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Create Menu">
- <separator string="Menu Information" colspan="4"/>
- <label string="Want to create a Index on Selected Pages ? "/>
- <separator string="" colspan="6" />
- <label string="" colspan="2"/>
- <group>
- <button special="cancel" string="Cancel" icon="gtk-cancel" />
- <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
- </group>
- </form>
+ <form string="Create Menu" version="7.0">
+ <header>
+ <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
+ <separator string="Menu Information" colspan="4"/>
+ <label string="Want to create a Index on Selected Pages ? "/>
+ </form>
</field>
</record>
=== modified file 'wiki/wizard/wiki_show_diff_view.xml'
--- wiki/wizard/wiki_show_diff_view.xml 2012-06-09 22:12:48 +0000
+++ wiki/wizard/wiki_show_diff_view.xml 2012-06-18 06:21:39 +0000
@@ -9,14 +9,10 @@
<field name="model">wizard.wiki.history.show_diff</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Difference">
- <separator colspan="4" string="Notes"/>
- <field name="file_path" colspan="4" width="300"/>
- <label string="" colspan="2" />
- <group>
- <button special="cancel" string="Close" icon="gtk-close" />
- </group>
- </form>
+ <form string="Difference">
+ <separator colspan="4" string="Notes"/>
+ <field name="file_path" colspan="4" width="300"/>
+ </form>
</field>
</record>
=== modified file 'wiki/wizard/wiki_wiki_page_open_view.xml'
--- wiki/wizard/wiki_wiki_page_open_view.xml 2012-06-09 22:12:48 +0000
+++ wiki/wizard/wiki_wiki_page_open_view.xml 2012-06-18 06:21:39 +0000
@@ -9,15 +9,12 @@
<field name="model">wiki.wiki.page.open</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Open Page">
- <separator string="" colspan="6" />
- <label string="Want to open a wiki page? "/>
- <separator string="" colspan="6" />
- <label string="" colspan="2" />
- <group>
- <button special="cancel" string="Cancel" icon="gtk-cancel" />
- <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
- </group>
+ <form string="Open Page" version="7.0">
+ <header>
+ <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+ </header>
+ <separator string="" colspan="6" />
+ <label string="Want to open a wiki page? "/>
</form>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
