diff options
| author | Ronak Baxi <rba@odoo.com> | 2015-07-08 14:42:58 +0530 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-08-19 08:10:45 +0200 |
| commit | 393f136509622f40f452ce9848d618977d5cd6e9 (patch) | |
| tree | 6b0e29d18dab279640960aebc35ef1370f25066e /addons | |
| parent | ad66daa6a9325aa14736c4ceb1d2aa1584499562 (diff) | |
[IMP] *: Uniformize all modal footers
The main button has classnames btn btn-primary.
Other buttons have classnames btn btn-default.
No more 'or' between the buttons.
Diffstat (limited to 'addons')
96 files changed, 213 insertions, 308 deletions
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml index f35c3ff25ce..929ea951482 100644 --- a/addons/account/views/account_payment_view.xml +++ b/addons/account/views/account_payment_view.xml @@ -210,9 +210,8 @@ </group> </sheet> <footer> - <button string='Validate' name="post" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string='Validate' name="post" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> @@ -254,9 +253,8 @@ </group> </group> <footer> - <button string='Validate' name="create_payment" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string='Validate' name="create_payment" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index 3c5f81686c5..293c58d7d68 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -337,9 +337,8 @@ </field> </group> <footer> - <button string="Confirm" name="validate" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Confirm" name="validate" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> @@ -363,9 +362,8 @@ <p>The closing balance is different than the computed one!</p> <p>Confirming this will create automatically a journal entry with the difference in the profit/loss account set on the cash journal.</p> <footer> - <button string="Confirm" name="validate" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Confirm" name="validate" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </div> </form> diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml index ef245fbf168..f56dc66f66f 100644 --- a/addons/account/wizard/account_invoice_refund_view.xml +++ b/addons/account/wizard/account_invoice_refund_view.xml @@ -40,9 +40,8 @@ </group> </group> <footer> - <button string='Create Refund' name="invoice_refund" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string='Create Refund' name="invoice_refund" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml index 91e4b5076ad..815215829eb 100644 --- a/addons/account/wizard/account_invoice_state_view.xml +++ b/addons/account/wizard/account_invoice_state_view.xml @@ -13,9 +13,8 @@ of accounts. </p> <footer> - <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> @@ -33,9 +32,8 @@ <field name="arch" type="xml"> <form string="Cancel Selected Invoices"> <footer> - <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_move_reversal_view.xml b/addons/account/wizard/account_move_reversal_view.xml index 2de0784e78a..5710b673972 100644 --- a/addons/account/wizard/account_move_reversal_view.xml +++ b/addons/account/wizard/account_move_reversal_view.xml @@ -12,9 +12,8 @@ <field name="journal_id"/> </group> <footer> - <button string="Reverse Moves" name="reverse_moves" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Reverse Moves" name="reverse_moves" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml index ab6b5bdc40b..760c0f3dd85 100644 --- a/addons/account/wizard/account_reconcile_view.xml +++ b/addons/account/wizard/account_reconcile_view.xml @@ -17,11 +17,10 @@ <field name="writeoff"/> </group> <footer> - <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/> - <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','=',0)]}" class="oe_highlight"/> - <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':['|',('writeoff','=',0),('trans_nbr','<',2)]}" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="btn-primary"/> + <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','=',0)]}" class="btn-primary"/> + <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':['|',('writeoff','=',0),('trans_nbr','<',2)]}" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> @@ -58,9 +57,8 @@ <field name="analytic_id" groups="analytic.group_analytic_accounting"/> </group> <footer> - <button string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml index 4a050d97d48..ed4f37ea34f 100644 --- a/addons/account/wizard/account_unreconcile_view.xml +++ b/addons/account/wizard/account_unreconcile_view.xml @@ -10,9 +10,8 @@ <separator string="Unreconcile Transactions"/> <label string="If you unreconcile transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/> <footer> - <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> @@ -38,4 +37,3 @@ </data> </openerp> - diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml index c805b0edad0..44d502768e3 100644 --- a/addons/account/wizard/account_validate_move_view.xml +++ b/addons/account/wizard/account_validate_move_view.xml @@ -10,9 +10,8 @@ <form string="Post Journal Entries"> <label string="All selected journal entries will be validated and posted. It means you won't be able to modify them afterwards."/> <footer> - <button string="Post Journal Entries" name="validate_move" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Post Journal Entries" name="validate_move" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account/wizard/pos_box.xml b/addons/account/wizard/pos_box.xml index 792db87091c..6588782eb33 100644 --- a/addons/account/wizard/pos_box.xml +++ b/addons/account/wizard/pos_box.xml @@ -12,9 +12,8 @@ <field name="amount" class="oe_inline"/> </group> <footer> - <button name="run" string="Put Money In" type="object" class="oe_highlight"/> - or - <button special="cancel" string="Cancel" class="oe_link"/> + <button name="run" string="Put Money In" type="object" class="btn-primary"/> + <button special="cancel" string="Cancel" class="btn-default"/> </footer> </form> </field> @@ -41,9 +40,8 @@ </group> <footer> - <button name="run" string="Take Money Out" type="object" class="oe_highlight"/> - or - <button class="oe_link" special="cancel" string="Cancel" /> + <button name="run" string="Take Money Out" type="object" class="btn-primary"/> + <button class="btn-default" special="cancel" string="Cancel" /> </footer> </form> </field> diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml index 8bfa6e5bf2a..d6ebaa7e5ca 100644 --- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml +++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml @@ -16,9 +16,8 @@ <field name="journal_ids" colspan="2" nolabel="1"/> </group> <footer> - <button name="print_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="print_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml index 3bbc835cac9..4a294d2c4d9 100644 --- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml +++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml @@ -8,9 +8,8 @@ <form string="Distribution Model Saved"> <label string="Save This Distribution as a Model"/> <footer> - <button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Ok" type="object" name="activate" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml index 095931b09bd..6e0335376e0 100644 --- a/addons/account_asset/wizard/account_asset_change_duration_view.xml +++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml @@ -21,9 +21,8 @@ </group> </group> <footer> - <button name="modify" string="Modify" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="modify" string="Modify" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml index 6525cb9f034..f4a9058461b 100644 --- a/addons/account_asset/wizard/wizard_asset_compute_view.xml +++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml @@ -15,9 +15,8 @@ <field name="date"/> </group> <footer> - <button string="Generate Entries" name="asset_compute" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Generate Entries" name="asset_compute" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_bank_statement_import/account_bank_statement_import_view.xml b/addons/account_bank_statement_import/account_bank_statement_import_view.xml index fea7ed34a45..ad708d30b63 100644 --- a/addons/account_bank_statement_import/account_bank_statement_import_view.xml +++ b/addons/account_bank_statement_import/account_bank_statement_import_view.xml @@ -13,9 +13,8 @@ <br/><label string= "2. Make sure you have installed the right module to support the file format."/> <br/><label string= "3. Select the file and click 'Import'."/> <footer> - <button name="import_file" string="_Import" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="import_file" string="_Import" type="object" class="btn-primary" /> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_bank_statement_import/wizard/journal_creation.xml b/addons/account_bank_statement_import/wizard/journal_creation.xml index 3894991eddb..e64b6db7a60 100644 --- a/addons/account_bank_statement_import/wizard/journal_creation.xml +++ b/addons/account_bank_statement_import/wizard/journal_creation.xml @@ -15,9 +15,8 @@ <field name="account_number"/> </group> <footer> - <button name="create_journal" string="OK" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="create_journal" string="OK" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml index 884d59271ef..ae4a6e074b8 100644 --- a/addons/account_budget/wizard/account_budget_analytic_view.xml +++ b/addons/account_budget/wizard/account_budget_analytic_view.xml @@ -12,9 +12,8 @@ <field name="date_to"/> </group> <footer> - <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="check_report" string="Print" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml index 32fd469da3a..9ef4a5489c4 100644 --- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml +++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml @@ -12,9 +12,8 @@ <field name="date_to"/> </group> <footer> - <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="check_report" string="Print" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml index 0113ad5b519..cf5b663ea91 100644 --- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml +++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml @@ -12,9 +12,8 @@ <field name="date_to"/> </group> <footer> - <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="check_report" string="Print" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml index 18343e5224b..4bd1933bc50 100644 --- a/addons/account_budget/wizard/account_budget_report_view.xml +++ b/addons/account_budget/wizard/account_budget_report_view.xml @@ -12,9 +12,8 @@ <field name="date_to"/> </group> <footer> - <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="check_report" string="Print" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/analytic/wizard/account_analytic_balance_report_view.xml b/addons/analytic/wizard/account_analytic_balance_report_view.xml index d4d5d652980..90fc65ced42 100644 --- a/addons/analytic/wizard/account_analytic_balance_report_view.xml +++ b/addons/analytic/wizard/account_analytic_balance_report_view.xml @@ -8,9 +8,8 @@ <field name="arch" type="xml"> <form string="Select Period"> <header> - <button name="check_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="check_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </header> <group col="4"> <field name="date1"/> diff --git a/addons/analytic/wizard/account_analytic_chart_view.xml b/addons/analytic/wizard/account_analytic_chart_view.xml index 8cbab1d5878..764743084d8 100644 --- a/addons/analytic/wizard/account_analytic_chart_view.xml +++ b/addons/analytic/wizard/account_analytic_chart_view.xml @@ -13,9 +13,8 @@ <label string="(Keep empty to open the current situation)" colspan="4"/> </group> <footer> - <button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report_view.xml index 55b13e345f0..efa7339646e 100644 --- a/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report_view.xml +++ b/addons/analytic/wizard/account_analytic_cost_ledger_for_journal_report_view.xml @@ -8,9 +8,8 @@ <field name="arch" type="xml"> <form string="Select period"> <header> - <button name="check_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="check_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </header> <group string="Cost Ledger for Period" col="4"> <field name="date1"/> diff --git a/addons/analytic/wizard/account_analytic_cost_ledger_view.xml b/addons/analytic/wizard/account_analytic_cost_ledger_view.xml index 25ab748732b..26b4d4bfd16 100644 --- a/addons/analytic/wizard/account_analytic_cost_ledger_view.xml +++ b/addons/analytic/wizard/account_analytic_cost_ledger_view.xml @@ -8,9 +8,8 @@ <field name="arch" type="xml"> <form string="Select Period"> <header> - <button name="check_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="check_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </header> <group col="4"> <field name="date1"/> diff --git a/addons/analytic/wizard/account_analytic_inverted_balance_report.xml b/addons/analytic/wizard/account_analytic_inverted_balance_report.xml index 5188c013b4d..a2d9408158c 100644 --- a/addons/analytic/wizard/account_analytic_inverted_balance_report.xml +++ b/addons/analytic/wizard/account_analytic_inverted_balance_report.xml @@ -8,9 +8,8 @@ <field name="arch" type="xml"> <form string="Select Period"> <header> - <button name="check_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="check_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </header> <group col="4"> <field name="date1"/> diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml index c007248288f..2f8816f0696 100644 --- a/addons/base_gengo/wizard/base_gengo_translations_view.xml +++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml @@ -18,9 +18,8 @@ </group> </group> <footer> - <button name="act_update" string="Send" type="object" class="oe_highlight"/> - or - <button name="act_cancel" special="cancel" string="Cancel" type="object" class="oe_link"/> + <button name="act_update" string="Send" type="object" class="btn-primary"/> + <button name="act_cancel" special="cancel" string="Cancel" type="object" class="btn-default"/> </footer> </form> </field> diff --git a/addons/base_import_module/views/base_import_module.xml b/addons/base_import_module/views/base_import_module.xml index 0ec17f5d394..d29cb341dd2 100644 --- a/addons/base_import_module/views/base_import_module.xml +++ b/addons/base_import_module/views/base_import_module.xml @@ -20,12 +20,12 @@ </group> <footer> <div states="init"> - <button name="import_module" string="Import Module" type="object" class="oe_highlight"/> or - <button special="cancel" string="Cancel" class="oe_link"/> + <button name="import_module" string="Import Module" type="object" class="btn-primary"/> + <button special="cancel" string="Cancel" class="btn-default"/> </div> <div states="done"> - <button name="action_module_open" string="Open Modules" type="object" class="oe_highlight"/> or - <button special="cancel" string="Close" class="oe_link"/> + <button name="action_module_open" string="Open Modules" type="object" class="btn-primary"/> + <button special="cancel" string="Close" class="btn-default"/> </div> </footer> </form> diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index d7724edfd37..684515d2e96 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -11,9 +11,8 @@ <field name="menu_parent_id"/> </group> <footer> - <button string="Create" name="board_create" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Create" name="board_create" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml index 903c63dd8a4..18ab116a4ed 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml +++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml @@ -37,8 +37,8 @@ </group> </group> <footer> - <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/> - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="action_apply" string="Create Opportunity" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> @@ -86,9 +86,8 @@ </group> </group> <footer> - <button name="mass_convert" string="Convert to Opportunities" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="mass_convert" string="Convert to Opportunities" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml index 0cccc207372..7dfc976c6ce 100644 --- a/addons/crm/wizard/crm_merge_opportunities_view.xml +++ b/addons/crm/wizard/crm_merge_opportunities_view.xml @@ -28,9 +28,8 @@ </field> </group> <footer> - <button name="action_merge" type="object" string="Merge" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="action_merge" type="object" string="Merge" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/crm_partner_assign/wizard/crm_channel_interested_view.xml b/addons/crm_partner_assign/wizard/crm_channel_interested_view.xml index 1312087bf7f..24315ec6d72 100644 --- a/addons/crm_partner_assign/wizard/crm_channel_interested_view.xml +++ b/addons/crm_partner_assign/wizard/crm_channel_interested_view.xml @@ -26,9 +26,8 @@ </p> </group> <footer> - <button name="action_confirm" string="Confirm" type="object" class="oe_highlight"/> - or - <button string="Cancel" special="cancel" class="oe_link"/> + <button name="action_confirm" string="Confirm" type="object" class="btn-primary"/> + <button string="Cancel" special="cancel" class="btn-default"/> </footer> </form> </field> diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml index 4d429dcab82..7daac520d0e 100644 --- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml +++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml @@ -30,9 +30,8 @@ </page> </notebook> <footer> - <button name="action_forward" string="Send" type="object" class="oe_highlight"/> - or - <button string="Cancel" special="cancel" class="oe_link"/> + <button name="action_forward" string="Send" type="object" class="btn-primary"/> + <button string="Cancel" special="cancel" class="btn-default"/> </footer> </form> </field> diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml index 4552939fbb6..46c1e0958ff 100644 --- a/addons/crm_project_issue/project_issue_view.xml +++ b/addons/crm_project_issue/project_issue_view.xml @@ -21,9 +21,8 @@ <field name="project_id"/> </group> <footer> - <button type="object" name="action_lead_to_project_issue" string="Create Issue" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button type="object" name="action_lead_to_project_issue" string="Create Issue" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml index bc7dc119968..97f53f70ef7 100644 --- a/addons/event/wizard/event_confirm_view.xml +++ b/addons/event/wizard/event_confirm_view.xml @@ -9,9 +9,8 @@ <form string="Event Confirmation"> <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/> <footer> - <button name="confirm" string="Confirm Anyway" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="confirm" string="Confirm Anyway" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/event_sale/wizard/event_edit_registration.xml b/addons/event_sale/wizard/event_edit_registration.xml index c84ac9167d9..bec8334a2e5 100644 --- a/addons/event_sale/wizard/event_edit_registration.xml +++ b/addons/event_sale/wizard/event_edit_registration.xml @@ -20,9 +20,8 @@ </tree> </field> <footer> - <button string="Apply" name="action_make_registration" type="object" class="oe_highlight"/> - or - <button string="Skip" class="oe_link" special="cancel"/> + <button string="Apply" name="action_make_registration" type="object" class="btn-primary"/> + <button string="Skip" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml index efd0c9f041c..9506fd7e2b2 100644 --- a/addons/gamification/views/challenge.xml +++ b/addons/gamification/views/challenge.xml @@ -272,9 +272,9 @@ </group> <footer> <center> - <button string="Accept" type="object" name="accept_challenge" class="oe_highlight" /> - <button string="Reject" type="object" name="discard_challenge"/> or - <button string="reply later" special="cancel" class="oe_link"/> + <button string="Accept" type="object" name="accept_challenge" class="btn-primary" /> + <button string="Reject" type="object" class="btn-default" name="discard_challenge"/> + <button string="reply later" special="cancel" class="btn-default"/> </center> </footer> </form> diff --git a/addons/gamification/wizard/grant_badge.xml b/addons/gamification/wizard/grant_badge.xml index f6498b35574..58628e26d25 100644 --- a/addons/gamification/wizard/grant_badge.xml +++ b/addons/gamification/wizard/grant_badge.xml @@ -14,8 +14,8 @@ <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding" /> </group> <footer> - <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or - <button string="Cancel" special="cancel" class="oe_link"/> + <button string="Grant Badge" type="object" name="action_grant_badge" class="btn-primary" /> + <button string="Cancel" special="cancel" class="btn-default"/> </footer> </form> </field> diff --git a/addons/gamification/wizard/update_goal.xml b/addons/gamification/wizard/update_goal.xml index 6a0944970ae..92710e21f66 100644 --- a/addons/gamification/wizard/update_goal.xml +++ b/addons/gamification/wizard/update_goal.xml @@ -13,8 +13,8 @@ <field name="current" /> </group> <footer> - <button string="Update" type="object" name="action_update_current" class="oe_highlight" /> or - <button string="Cancel" special="cancel" class="oe_link"/> + <button string="Update" type="object" name="action_update_current" class="btn-primary" /> + <button string="Cancel" special="cancel" class="btn-default"/> </footer> </form> </field> diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml index 7876ff57911..bb538952f20 100644 --- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml @@ -14,9 +14,8 @@ </group> <label string="Below the maximum tolerance, the attendance error will not be taken into account. Above the maximum tolerance, the error is considered to be voluntary and will be taken into account." colspan="2"/> <footer> - <button name="print_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="print_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/hr_gamification/wizard/grant_badge.xml b/addons/hr_gamification/wizard/grant_badge.xml index 15a61e108fa..2edad65173f 100644 --- a/addons/hr_gamification/wizard/grant_badge.xml +++ b/addons/hr_gamification/wizard/grant_badge.xml @@ -27,8 +27,8 @@ <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" /> </group> <footer> - <button string="Reward Employee" type="object" name="action_grant_badge" class="oe_highlight" /> or - <button string="Cancel" special="cancel" class="oe_link"/> + <button string="Reward Employee" type="object" name="action_grant_badge" class="btn-primary" /> + <button string="Cancel" special="cancel" class="btn-default"/> </footer> </form> </field> diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml index 20489a60bdf..f598c976581 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml @@ -13,8 +13,8 @@ <field name="depts"/> </group> <footer> - <button name="print_report" string="Print" type="object" class="oe_highlight"/> or - <button string="Cancel" special="cancel" class="oe_link"/> + <button name="print_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" special="cancel" class="btn-default"/> </footer> </form> </field> diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml index 7db0928bd2b..9de82c234ce 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml @@ -15,9 +15,8 @@ <field name="emp" invisible="True"/> </group> <footer> - <button name="print_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="print_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml index dfa4b91f134..4e1dbcda9e2 100644 --- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml +++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml @@ -13,9 +13,8 @@ <field name="date_to"/> </group> <footer> - <button name="print_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="print_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml index 349e6f50631..d9805032130 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml @@ -21,8 +21,8 @@ </group> </sheet> <footer> - <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or - <button special="cancel" string="Cancel" class="oe_link"/> + <button name="print_report" string="Print" colspan="1" type="object" class="btn-primary"/> + <button special="cancel" string="Cancel" class="btn-default"/> </footer> </form> </field> diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml index 0bb7f914325..b2f8fb4fbca 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml @@ -43,9 +43,8 @@ </group> </group> <footer> - <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="do_create" string="Create Invoice" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml index 8ddeb262f3b..c556098c681 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml @@ -23,9 +23,8 @@ </group> </group> <footer> - <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="do_create" string="Create Invoices" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml index 2563bbfed05..403b8a3a26e 100644 --- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml +++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml @@ -10,9 +10,8 @@ <separator string="It will open your current timesheet"/> </group> <footer> - <button name="open_timesheet" string="Open" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="open_timesheet" string="Open" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml index a069a283046..a408361e577 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml +++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml @@ -27,10 +27,9 @@ </page> </notebook> <footer> - <button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/> - <button name="preview" string="_Preview" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="create_xml" string="Create _XML" type="object" class="btn-primary"/> + <button name="preview" string="_Preview" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/l10n_be_intrastat/wizard/l10n_be_intrastat_xml_view.xml b/addons/l10n_be_intrastat/wizard/l10n_be_intrastat_xml_view.xml index 918a490cdfa..e3f0f1674f5 100644 --- a/addons/l10n_be_intrastat/wizard/l10n_be_intrastat_xml_view.xml +++ b/addons/l10n_be_intrastat/wizard/l10n_be_intrastat_xml_view.xml @@ -27,12 +27,11 @@ </div> <footer> <group states="draft"> - <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="create_xml" string="Create XML" type="object" default_focus="1" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </group> <group states="download"> - <button string="Close" special="cancel" /> + <button string="Close" special="cancel" class="btn-default"/> </group> </footer> </form> diff --git a/addons/l10n_eu_service/wizard/wizard.xml b/addons/l10n_eu_service/wizard/wizard.xml index 33db37ef9c0..9ceac6978db 100644 --- a/addons/l10n_eu_service/wizard/wizard.xml +++ b/addons/l10n_eu_service/wizard/wizard.xml @@ -37,9 +37,8 @@ </group> <footer> <button string="Create Fiscal Positions and Taxes" - name="generate_eu_service" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + name="generate_eu_service" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml index 9fd5b657d79..87e529b73ef 100644 --- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml +++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml @@ -8,9 +8,8 @@ <form string="Employee Pay Head Breakup"> <label string="This wizard will print report which displays employees break-up of Net Head for a specified dates."/> <footer> - <button name="print_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="print_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> <group> <field name="start_date"/> diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml index d1d0a13cc17..f00b90da967 100644 --- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml +++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml @@ -8,9 +8,8 @@ <form string="Pay Head Employee Breakup"> <label string="This wizard will print report which display a pay head employee breakup for a specified dates."/> <footer> - <button name="print_report" string="Print" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="print_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> <group> <field name="date_from"/> diff --git a/addons/mail/wizard/invite_view.xml b/addons/mail/wizard/invite_view.xml index 0e9a5373e4f..46dd25d8e94 100644 --- a/addons/mail/wizard/invite_view.xml +++ b/addons/mail/wizard/invite_view.xml @@ -19,9 +19,8 @@ </group> <footer> <button string="Add Followers" - name="add_followers" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + name="add_followers" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 964ebbe96a2..523b8fcd794 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -60,9 +60,8 @@ <field name="body" options="{'style-inline': true}"/> <field name="attachment_ids" widget="many2many_binary" string="Attach a file"/> <footer> - <button string="Send" name="send_mail_action" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button string="Send" name="send_mail_action" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> <group class="oe_right oe_form" col="1"> <div>Use template diff --git a/addons/mass_mailing/wizard/test_mailing.xml b/addons/mass_mailing/wizard/test_mailing.xml index 08ee5b3906b..1cfee09a977 100644 --- a/addons/mass_mailing/wizard/test_mailing.xml +++ b/addons/mass_mailing/wizard/test_mailing.xml @@ -14,9 +14,8 @@ <field name="email_to"/> </group> <footer> - <button string="Send Sample Mail" name="send_mail_test" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button string="Send Sample Mail" name="send_mail_test" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml index 896f4ef92e6..484188a305c 100644 --- a/addons/membership/wizard/membership_invoice_view.xml +++ b/addons/membership/wizard/membership_invoice_view.xml @@ -12,9 +12,8 @@ <field name="member_price"/> </group> <footer> - <button string="Invoice Membership" name="membership_invoice" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button string="Invoice Membership" name="membership_invoice" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml index 5b7558d5e8e..de72bc4fc87 100644 --- a/addons/mrp/wizard/change_production_qty_view.xml +++ b/addons/mrp/wizard/change_production_qty_view.xml @@ -16,9 +16,8 @@ </group> <footer> <button name="change_prod_qty" string="Approve" - colspan="1" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + colspan="1" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml index 6535f390f9f..3db1f180b8e 100644 --- a/addons/mrp/wizard/mrp_product_produce_view.xml +++ b/addons/mrp/wizard/mrp_product_produce_view.xml @@ -32,9 +32,8 @@ </field> </group> <footer> - <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="do_produce" type="object" string="Confirm" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/mrp/wizard/stock_move_view.xml b/addons/mrp/wizard/stock_move_view.xml index 86588927c57..e898a96655b 100644 --- a/addons/mrp/wizard/stock_move_view.xml +++ b/addons/mrp/wizard/stock_move_view.xml @@ -20,9 +20,8 @@ <field name="location_id" groups="stock.group_locations"/> </group> <footer> - <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="do_move_consume" string="Ok" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py index f0bf9955a18..a0271d670ee 100644 --- a/addons/mrp_repair/wizard/cancel_repair.py +++ b/addons/mrp_repair/wizard/cancel_repair.py @@ -55,9 +55,8 @@ class repair_cancel(osv.osv_memory): res['arch'] = """ <form string="Cancel Repair" version="7.0"> <header> - <button name="cancel_repair" string="_Yes" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="cancel_repair" string="_Yes" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </header> <label string="Do you want to continue?"/> </form> diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml index 53f1034a0fe..0ab931869eb 100644 --- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml +++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml @@ -13,9 +13,8 @@ <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/> </group> <footer> - <button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="cancel_repair" string="Yes" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml index 05f21aff262..d8bb53a9db1 100644 --- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml +++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml @@ -13,9 +13,8 @@ <field name="group"/> </group> <footer> - <button name="make_invoices" string="Create Invoice" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="make_invoices" string="Create Invoice" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml index d5203c38e29..d0a1653a348 100644 --- a/addons/point_of_sale/wizard/pos_confirm.xml +++ b/addons/point_of_sale/wizard/pos_confirm.xml @@ -10,9 +10,8 @@ <separator string="Generate Journal Entries"/> <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."/> <footer> - <button name="action_confirm" string="Generate Entries" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="action_confirm" string="Generate Entries" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml index c34bc1eb71c..87950677e5e 100644 --- a/addons/point_of_sale/wizard/pos_details.xml +++ b/addons/point_of_sale/wizard/pos_details.xml @@ -14,9 +14,8 @@ </group> <field name="user_ids"/> <footer> - <button name="print_report" type="object" string="Print Report" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="print_report" type="object" string="Print Report" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml index 44ddf9ca011..c01be27fdcf 100644 --- a/addons/point_of_sale/wizard/pos_discount.xml +++ b/addons/point_of_sale/wizard/pos_discount.xml @@ -12,9 +12,8 @@ <field name="discount"/> </group> <footer> - <button name="apply_discount" string="Apply Discount" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="apply_discount" string="Apply Discount" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml index 6cbb99bb3a1..cc10f44dce1 100644 --- a/addons/point_of_sale/wizard/pos_open_statement.xml +++ b/addons/point_of_sale/wizard/pos_open_statement.xml @@ -11,9 +11,8 @@ <separator string="Do you want to open cash registers?"/> <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/> <footer> - <button name="open_statement" type="object" string="Open Registers" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="open_statement" type="object" string="Open Registers" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml index 17b97fecc07..3b0ec0a679f 100644 --- a/addons/point_of_sale/wizard/pos_payment.xml +++ b/addons/point_of_sale/wizard/pos_payment.xml @@ -13,9 +13,8 @@ <field name="payment_name"/> </group> <footer> - <button name="check" string="Make Payment" type="object" class="oe_highlight"/> - or - <button special="cancel" string="Cancel" class="oe_link"/> + <button name="check" string="Make Payment" type="object" class="btn-primary"/> + <button special="cancel" string="Cancel" class="btn-default"/> </footer> </form> </field> diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml index aeacad9daf8..3958732f77b 100644 --- a/addons/portal/wizard/portal_wizard_view.xml +++ b/addons/portal/wizard/portal_wizard_view.xml @@ -28,9 +28,8 @@ <field name="welcome_message" placeholder="This text is included in the email sent to new portal users."/> <footer> - <button string="Apply" name="action_apply" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button string="Apply" name="action_apply" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml index 2d2dc110e8a..e5ce8eca5cb 100644 --- a/addons/procurement/wizard/schedulers_all_view.xml +++ b/addons/procurement/wizard/schedulers_all_view.xml @@ -13,9 +13,8 @@ Compute all procurements in the background. </p> <footer> - <button name="procure_calculation" string="Run Schedulers" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="procure_calculation" string="Run Schedulers" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml index d37dd6b24c8..cb85c4dba60 100644 --- a/addons/product/wizard/product_price_view.xml +++ b/addons/product/wizard/product_price_view.xml @@ -18,9 +18,8 @@ <field name="qty5"/> </group> <footer> - <button name="print_report" string="Print" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="print_report" string="Print" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/product_extended/product_extended_wizard.xml b/addons/product_extended/product_extended_wizard.xml index ace66fac207..88c64359e5b 100644 --- a/addons/product_extended/product_extended_wizard.xml +++ b/addons/product_extended/product_extended_wizard.xml @@ -14,9 +14,8 @@ <field name="recursive"/> </group> <footer> - <button name="compute_from_bom" string="Set price on BoM" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="compute_from_bom" string="Set price on BoM" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml index f43cb786b3c..ecdc36352e6 100644 --- a/addons/product_margin/wizard/product_margin_view.xml +++ b/addons/product_margin/wizard/product_margin_view.xml @@ -12,9 +12,8 @@ <field name="invoice_state" /> </group> <footer> - <button name="action_open_window" string="Open Margins" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="action_open_window" string="Open Margins" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml index 5e68d28b51d..8af82622f4a 100644 --- a/addons/purchase/wizard/purchase_line_invoice_view.xml +++ b/addons/purchase/wizard/purchase_line_invoice_view.xml @@ -13,9 +13,8 @@ <label string="Do you want to generate the supplier bills?"/> </group> <footer> - <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="makeInvoices" string="Confirm" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml index 56efe485ae5..d0ee1bd3ad8 100644 --- a/addons/purchase/wizard/purchase_order_group_view.xml +++ b/addons/purchase/wizard/purchase_order_group_view.xml @@ -20,9 +20,8 @@ Lines will only be merged if: </group> <footer> - <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="merge_orders" string="Merge orders" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/purchase_requisition/wizard/bid_line_qty_view.xml b/addons/purchase_requisition/wizard/bid_line_qty_view.xml index b8d1446453f..160b44964e1 100644 --- a/addons/purchase_requisition/wizard/bid_line_qty_view.xml +++ b/addons/purchase_requisition/wizard/bid_line_qty_view.xml @@ -10,9 +10,8 @@ <field name="qty" context="{'default_qty': 0}"/> </group> <footer> - <button name="change_qty" string="Change Quantity" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="change_qty" string="Change Quantity" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml index b0e3b03117a..a01a5f7d15d 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml @@ -10,9 +10,8 @@ <field name="partner_ids" widget="many2many_tags" context="{'default_supplier': 1, 'default_customer': 0}"/> </group> <footer> - <button name="create_order" string="Create Request for Quotation" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="create_order" string="Create Request for Quotation" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml index 7a991794572..df5343da0b7 100644 --- a/addons/report_webkit/wizard/report_webkit_actions_view.xml +++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml @@ -12,9 +12,8 @@ <field name="open_action"/> </group> <footer> - <button name="do_action" type="object" string="_Ok" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="do_action" type="object" string="_Ok" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml index 137d4aa603d..148810992c2 100644 --- a/addons/sale/wizard/sale_line_invoice.xml +++ b/addons/sale/wizard/sale_line_invoice.xml @@ -13,9 +13,8 @@ <footer> <button name="make_invoices" string="Create & View Invoice" type="object" context="{'open_invoices': True}" class="oe_highlight"/> - <button name="make_invoices" string="Create Invoices" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="make_invoices" string="Create Invoices" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml index df588f92edf..4beaadde209 100644 --- a/addons/sale/wizard/sale_make_invoice.xml +++ b/addons/sale/wizard/sale_make_invoice.xml @@ -12,9 +12,8 @@ <field name="invoice_date"/> </group> <footer> - <button name="make_invoices" string="Create Invoices" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="make_invoices" string="Create Invoices" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml index cdaecab18e7..4822fdf43d1 100644 --- a/addons/sale/wizard/sale_make_invoice_advance.xml +++ b/addons/sale/wizard/sale_make_invoice_advance.xml @@ -32,16 +32,15 @@ </div> <footer> <button name="create_invoices" string="Create and View Invoice" type="object" - context="{'open_invoices': True}" class="oe_highlight" + context="{'open_invoices': True}" class="btn-primary" attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/> <button name="create_invoices" string="Create Invoice" type="object" - class="oe_highlight" + class="btn-primary" attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/> <button name="create_invoices" string="Show Lines to Invoice" type="object" - class="oe_highlight" + class="btn-primary" attrs="{'invisible': [('advance_payment_method', '!=', 'lines')]}"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/stock/wizard/make_procurement_view.xml b/addons/stock/wizard/make_procurement_view.xml index 49b875da461..f9f964c0811 100644 --- a/addons/stock/wizard/make_procurement_view.xml +++ b/addons/stock/wizard/make_procurement_view.xml @@ -27,9 +27,8 @@ <field name="route_ids" widget="many2many_tags" groups="stock.group_adv_location"/> </group> <footer> - <button name="make_procurement" string="Ask New Products" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="make_procurement" string="Ask New Products" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/orderpoint_procurement_view.xml b/addons/stock/wizard/orderpoint_procurement_view.xml index 94113fbf8b0..21437b3eb86 100644 --- a/addons/stock/wizard/orderpoint_procurement_view.xml +++ b/addons/stock/wizard/orderpoint_procurement_view.xml @@ -13,9 +13,8 @@ <label string="Wizard checks all the stock minimum rules and generate procurement order."/> </group> <footer> - <button name="procure_calculation" string="Compute Stock" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="procure_calculation" string="Compute Stock" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_backorder_confirmation.xml b/addons/stock/wizard/stock_backorder_confirmation.xml index 1a58c6d369f..c8bfbd9416a 100644 --- a/addons/stock/wizard/stock_backorder_confirmation.xml +++ b/addons/stock/wizard/stock_backorder_confirmation.xml @@ -10,9 +10,8 @@ </group> <footer> <button name="process" string="Create Backorder" type="object" class="oe_highlight"/> - <button name="process_cancel_backorder" string="No Backorder" type="object" class="oe_highlight"/> - or - <button string="_Cancel" class="oe_link" special="cancel" /> + <button name="process_cancel_backorder" string="No Backorder" type="object" class="btn-primary"/> + <button string="_Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml index 4bf556fcaef..8dc5a1b3512 100644 --- a/addons/stock/wizard/stock_change_product_qty_view.xml +++ b/addons/stock/wizard/stock_change_product_qty_view.xml @@ -17,9 +17,8 @@ </p> </group> <footer> - <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/> - or - <button string="_Cancel" class="oe_link" special="cancel" /> + <button name="change_product_qty" string="_Apply" type="object" class="btn-primary"/> + <button string="_Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_immediate_transfer.xml b/addons/stock/wizard/stock_immediate_transfer.xml index 67084df776d..495e8446a58 100644 --- a/addons/stock/wizard/stock_immediate_transfer.xml +++ b/addons/stock/wizard/stock_immediate_transfer.xml @@ -11,9 +11,8 @@ </p> </group> <footer> - <button name="process" string="_Apply" type="object" class="oe_highlight"/> - or - <button string="_Cancel" class="oe_link" special="cancel" /> + <button name="process" string="_Apply" type="object" class="btn-primary"/> + <button string="_Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_lot_split.xml b/addons/stock/wizard/stock_lot_split.xml index cee63bc0da1..2f2ea3ae679 100644 --- a/addons/stock/wizard/stock_lot_split.xml +++ b/addons/stock/wizard/stock_lot_split.xml @@ -26,9 +26,8 @@ </field> </group> <footer> - <button name="process" string="_Apply" type="object" class="oe_highlight"/> - or - <button string="_Cancel" class="oe_link" special="cancel" /> + <button name="process" string="_Apply" type="object" class="btn-primary"/> + <button string="_Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml index b4253c3e4d2..687938e2966 100644 --- a/addons/stock/wizard/stock_move_view.xml +++ b/addons/stock/wizard/stock_move_view.xml @@ -22,9 +22,8 @@ domain="[('usage','!=','view'),('scrap_location','=',True)]" groups="stock.group_locations"/> </group> <footer> - <button name="move_scrap" string="Scrap" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="move_scrap" string="Scrap" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock/wizard/stock_pack_details.xml b/addons/stock/wizard/stock_pack_details.xml index 920fcaeabc1..a1352667054 100644 --- a/addons/stock/wizard/stock_pack_details.xml +++ b/addons/stock/wizard/stock_pack_details.xml @@ -35,9 +35,8 @@ </group> </group> <footer> - <button name="process" string="Save" type="object" class="oe_highlight"/> - or - <button string="_Cancel" class="oe_link" special="cancel" /> + <button name="process" string="Save" type="object" class="btn-primary"/> + <button string="_Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> @@ -53,4 +52,4 @@ <field name="target">new</field> <field name="context">{}</field> </record> -</odoo>
\ No newline at end of file +</odoo> diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml index 642097090b2..3fffc00a55f 100644 --- a/addons/stock/wizard/stock_return_picking_view.xml +++ b/addons/stock/wizard/stock_return_picking_view.xml @@ -32,9 +32,8 @@ <field name="location_id" options="{'no_create': True, 'no_open': True}" groups="stock.group_locations"/> </group> <footer> - <button name="create_returns" string="Return" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="create_returns" string="Return" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock_account/wizard/stock_change_standard_price_view.xml b/addons/stock_account/wizard/stock_change_standard_price_view.xml index 1dbe3d499b9..10808c386ed 100644 --- a/addons/stock_account/wizard/stock_change_standard_price_view.xml +++ b/addons/stock_account/wizard/stock_change_standard_price_view.xml @@ -11,9 +11,8 @@ <field name="new_price" string="Cost Price"/> </group> <footer> - <button name="change_price" string="_Apply" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="change_price" string="_Apply" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock_account/wizard/stock_invoice_onshipping_view.xml b/addons/stock_account/wizard/stock_invoice_onshipping_view.xml index a65691880fb..18390b97d6c 100644 --- a/addons/stock_account/wizard/stock_invoice_onshipping_view.xml +++ b/addons/stock_account/wizard/stock_invoice_onshipping_view.xml @@ -15,9 +15,8 @@ <field name="invoice_date" /> </group> <footer> - <button name="open_invoice" string="Create" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="open_invoice" string="Create" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/stock_account/wizard/stock_valuation_history_view.xml b/addons/stock_account/wizard/stock_valuation_history_view.xml index 0903be4392f..1c0fad78c34 100644 --- a/addons/stock_account/wizard/stock_valuation_history_view.xml +++ b/addons/stock_account/wizard/stock_valuation_history_view.xml @@ -21,9 +21,8 @@ <field name="date" attrs="{'invisible': [('choose_date', '=', False)]}"/> </group> <footer> - <button name="open_table" string="Retrieve the Inventory Value" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button name="open_table" string="Retrieve the Inventory Value" type="object" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel" /> </footer> </form> </field> diff --git a/addons/stock_picking_wave/wizard/picking_to_wave_view.xml b/addons/stock_picking_wave/wizard/picking_to_wave_view.xml index c5624f1abb2..8101f71b6bc 100644 --- a/addons/stock_picking_wave/wizard/picking_to_wave_view.xml +++ b/addons/stock_picking_wave/wizard/picking_to_wave_view.xml @@ -11,9 +11,8 @@ <separator string="Select a wave"/> <field name="wave_id" class="oe_inline"/> <footer> - <button name="attach_pickings" type="object" string="Add to wave" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel"/> + <button name="attach_pickings" type="object" string="Add to wave" class="btn-primary"/> + <button string="Cancel" class="btn-default" special="cancel"/> </footer> </form> </field> diff --git a/addons/survey/wizard/survey_email_compose_message.xml b/addons/survey/wizard/survey_email_compose_message.xml index d9a68b1e417..2136473883e 100644 --- a/addons/survey/wizard/survey_email_compose_message.xml +++ b/addons/survey/wizard/survey_email_compose_message.xml @@ -63,12 +63,11 @@ </group> </group> <footer attrs="{'invisible':[('public','in',['email_private', 'email_public_link'])]}"> - <button string="Close" class="oe_link" special="cancel" /> + <button string="Close" class="btn-primary" special="cancel" /> </footer> <footer attrs="{'invisible':['|',('public','=',False),('public','in',['public_link'])]}"> - <button string="Send" name="send_mail" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> + <button string="Send" name="send_mail" type="object" class="btn-primary" /> + <button string="Cancel" class="btn-default" special="cancel" /> <group class="oe_right" col="1"> <div> Use template diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a14c1fc7c6c..51051081419 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -465,8 +465,7 @@ </div> <span class="o_form_buttons_edit"> <button type="button" class="oe_form_button_save btn btn-primary btn-sm" accesskey="S">Save</button> - <span class="oe_fade">or</span> - <a href="#" class="oe_bold oe_form_button_cancel" accesskey="D">Discard</a> + <button type="button" class="oe_form_button_cancel btn btn-sm btn-default" accesskey="D">Discard</button> </span> </t> </div> @@ -1382,9 +1381,9 @@ </div> </t> <t t-name="M2ODialog.buttons"> - <button class="oe_form_m2o_qc_button oe_button oe_highlight">Create</button> - <button class="oe_form_m2o_sc_button oe_button">Create and edit</button> or - <button class="oe_form_m2o_cancel_button oe_button oe_link"><span>Cancel</span></button> + <button class="oe_form_m2o_qc_button btn btn-primary">Create</button> + <button class="oe_form_m2o_sc_button btn btn-default">Create and edit</button> + <button class="oe_form_m2o_cancel_button btn btn-default"><span>Cancel</span></button> </t> <t t-name="FieldMonetary" t-extend="FieldChar"> <t t-jquery="t:first" t-operation="before"> diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml index 01cbb868624..d1df87f0664 100644 --- a/addons/website/views/res_config.xml +++ b/addons/website/views/res_config.xml @@ -9,7 +9,6 @@ <form string="Configure Website" class="oe_form_configuration"> <header> <button string="Apply" type="object" name="execute" class="oe_highlight"/> - or <button string="Cancel" type="object" name="cancel" class="oe_link"/> </header> <div> diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml index 58c13347619..dbcec253891 100644 --- a/addons/website/views/website_views.xml +++ b/addons/website/views/website_views.xml @@ -19,7 +19,6 @@ <form string="Website Settings"> <header> <button string="Apply" type="object" name="noop" class="oe_highlight"/> - or <button string="Cancel" type="object" name="noop" class="oe_link"/> </header> <div name="domain"> |