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

[REF] *: BS4, rename btn-default to btn-secondary

Browse Source 
BS4 "btn-default" class was replaced with "btn-secondary", which makes
more sense.
This commit is contained in:
qsm-odoo
2018-07-27 12:36:54 +02:00
parent 81f359c81c
commit c59380bac5
185 changed files with 361 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/static/src/scss/account_dashboard.scss
+1 -1
View File
@@ -29,7 +29,7 @@
}
}
.o_arrow_button.btn-default {
.o_arrow_button.btn-secondary {
color: $text-muted;
text-transform: none;
font-weight: 500;
addons/account/static/src/xml/account_dashboard_setup_bar.xml
+4 -4
View File
@@ -5,22 +5,22 @@
<div class="o_account_dashboard_header d-none d-md-block o_form_view" t-if="values['show_setup_bar']">
<div class="o_form_statusbar">
<div class="o_statusbar_status" data-original-title="" title="" >
<button name="setting_chart_of_accounts_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['chart_of_accounts'] and 'o_action_done' or ''}" >
<button name="setting_chart_of_accounts_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['chart_of_accounts'] and 'o_action_done' or ''}" >
<i class="fa fa-check" t-if="values['chart_of_accounts']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">4</b>
Chart of Accounts
</button>
<button name="setting_init_fiscal_year_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['fiscal_year'] and 'o_action_done' or ''}">
<button name="setting_init_fiscal_year_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['fiscal_year'] and 'o_action_done' or ''}">
<i class="fa fa-check" t-if="values['fiscal_year']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">3</b>
Fiscal Year
</button>
<button name="setting_init_bank_account_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['bank'] and 'o_action_done' or ''}">
<button name="setting_init_bank_account_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['bank'] and 'o_action_done' or ''}">
<i class="fa fa-check" t-if="values['bank']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">2</b>
Add a Bank Account
</button>
<button name="setting_init_company_action" type="company_object" t-attf-class="btn o_arrow_button btn-default account_setup_dashboard_action #{values['company'] and 'o_action_done' or ''}">
<button name="setting_init_company_action" type="company_object" t-attf-class="btn o_arrow_button btn-secondary account_setup_dashboard_action #{values['company'] and 'o_action_done' or ''}">
<i class="fa fa-check" t-if="values['company']" role="img" aria-label="Current state" title="Current state" aria-current="step"/>
<b class="o_account_dashboard_index">1</b>
Company Data
addons/account/static/src/xml/account_payment.xml
+1 -1
View File
@@ -79,7 +79,7 @@
</table>
</div>
<button class="btn btn-xs btn-primary js_unreconcile_payment pull-left" t-att-payment-id="payment_id" style="margin-top:5px; margin-bottom:5px;">Unreconcile</button>
<button class="btn btn-xs btn-default js_open_payment pull-right" t-att-payment-id="account_payment_id" t-att-invoice-id="invoice_id" t-att-move-id="move_id" style="margin-top:5px; margin-bottom:5px;">View</button>
<button class="btn btn-xs btn-secondary js_open_payment pull-right" t-att-payment-id="account_payment_id" t-att-invoice-id="invoice_id" t-att-move-id="move_id" style="margin-top:5px; margin-bottom:5px;">View</button>
</t>
</templates>
addons/account/static/src/xml/account_reconciliation.xml
+6 -6
View File
@@ -26,12 +26,12 @@
</div>
<div aria-valuemin="0" t-att-aria-valuenow="widget._initialState.valuenow" class="progress-bar" role="progressbar" style="width: 0%;" t-att-aria-valuemax="widget._initialState.valuemax"></div>
</div>
<button class="btn btn-default o_automatic_reconciliation pull-right" title="Let odoo try to reconcile entries for the user">Automatic reconciliation</button>
<button class="btn btn-secondary o_automatic_reconciliation pull-right" title="Let odoo try to reconcile entries for the user">Automatic reconciliation</button>
<div class="notification_area"/>
</div>
<div class="o_reconciliation_lines"/>
<div t-if="widget._initialState.valuemax &gt; widget._initialState.defaultDisplayQty">
<button class="btn btn-default js_load_more">Load more</button>
<button class="btn btn-secondary js_load_more">Load more</button>
</div>
<div class="pull-right text-muted">Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet.</div>
</div>
@@ -59,7 +59,7 @@
<t t-if="context &amp;&amp; context.active_model">
<p t-if="context['active_model'] === 'account.journal' || context['active_model'] === 'account.bank.statement'" class="actions_buttons">
<t t-if="context.journal_id">
<button class="button_back_to_statement btn btn-default" t-att-data_journal_id='context.journal_id'>Go to bank statement(s)</button>
<button class="button_back_to_statement btn btn-secondary" t-att-data_journal_id='context.journal_id'>Go to bank statement(s)</button>
</t>
<t t-if="context['active_model'] === 'account.bank.statement'">
<button class="button_close_statement btn btn-primary" style="display: inline-block;">Close statement</button>
@@ -74,7 +74,7 @@
<table class="accounting_view">
<caption>
<div class="pull-right o_buttons">
<button t-attf-class="o_validate btn btn-default #{!state.balance.type ? '' : 'd-none'}">Validate</button>
<button t-attf-class="o_validate btn btn-secondary #{!state.balance.type ? '' : 'd-none'}">Validate</button>
<button t-attf-class="o_reconcile btn btn-primary #{state.balance.type &gt; 0 ? '' : 'd-none'}">Reconcile</button>
<span t-attf-class="o_no_valid text-danger #{state.balance.type &lt; 0 ? '' : 'd-none'}">Select a partner or choose a counterpart</span>
</div>
@@ -107,9 +107,9 @@
<t t-name="reconciliation.manual.line" t-extend="reconciliation.line">
<t t-jquery=".o_buttons" t-operation="replace">
<div class="pull-right o_buttons">
<button t-attf-class="o_validate btn btn-default #{!state.balance.type ? '' : 'd-none'}">Reconcile</button>
<button t-attf-class="o_validate btn btn-secondary #{!state.balance.type ? '' : 'd-none'}">Reconcile</button>
<button t-attf-class="o_reconcile btn btn-primary #{state.balance.type &gt; 0 ? '' : 'd-none'}">Reconcile</button>
<button t-attf-class="o_no_valid btn btn-default #{state.balance.type &lt; 0 ? '' : 'd-none'}">Skip</button>
<button t-attf-class="o_no_valid btn btn-secondary #{state.balance.type &lt; 0 ? '' : 'd-none'}">Skip</button>
</div>
</t>
<t t-jquery=".accounting_view tbody" t-operation="append">
addons/account/static/tests/reconciliation_tests.js
+2 -2
View File
@@ -661,7 +661,7 @@ QUnit.module('account', {
" 101200 2017-02-28 Camptocamp: INV/2017/0001 $ 4,610.00 111100 2017-02-28 Camptocamp: BILL/2017/0001 $ 10,000.00 111100 2017-02-28 ASUSTeK: BILL/2017/0002 $ 5,749.99 ",
"should display the next 5 account move lines");
assert.ok(clientAction.widgets[0].$('caption button.btn-default:visible').length, "should display the 'validate' button");
assert.ok(clientAction.widgets[0].$('caption button.btn-secondary:visible').length, "should display the 'validate' button");
assert.ok(clientAction.widgets[1].$('caption .text-danger:visible').length, "should display the 'Select a partner or choose a counterpart' message");
assert.ok(clientAction.widgets[2].$('caption button.btn-primary:visible').length, "should display the 'Reconcile' button");
@@ -1029,7 +1029,7 @@ QUnit.module('account', {
assert.strictEqual(widget.$('.accounting_view tbody tr').length, 1, "should have ever only the created reconcile line");
assert.strictEqual(widget.$('.accounting_view tbody tr').text().replace(/[\n\r\s$,]+/g, ' '), " 101200 SAJ/2014/002 and SAJ/2014/003 1100.00 ",
"the new line should be update the amout");
assert.ok(widget.$('caption button.btn-default:visible').length, "should display the 'validate' button");
assert.ok(widget.$('caption button.btn-secondary:visible').length, "should display the 'validate' button");
widget.$('.create .add_line').trigger('click').trigger('click');
widget.$('.create .create_amount input').val('-100').trigger('input');
addons/account/views/account_payment_view.xml
+2 -2
View File
@@ -287,7 +287,7 @@
</sheet>
<footer>
<button string='Validate' name="action_validate_invoice_payment" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
@@ -355,7 +355,7 @@
</group>
<footer>
<button string='Validate' name="create_payments" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/views/account_portal_templates.xml
+2 -2
View File
@@ -85,8 +85,8 @@
</div>
<div class="o_payment_button">
<div class="text-center mb8 ml16 mr16 o_download_pdf">
<a class="btn btn-default btn-block o_download_btn" t-att-href="'/my/invoices/pdf/%s?%s' % (invoice.id, keep_query())" title="Download"><i class="fa fa-download"/> Download</a>
<a class="btn btn-default btn-block d-none d-lg-inline-block o_print_btn o_portal_invoice_print" t-att-href="'/my/invoices/pdf/%s?%s&amp;print=true' % (invoice.id, keep_query())" id="print_invoice_report" title="Print"><i class="fa fa-print"/> Print</a>
<a class="btn btn-secondary btn-block o_download_btn" t-att-href="'/my/invoices/pdf/%s?%s' % (invoice.id, keep_query())" title="Download"><i class="fa fa-download"/> Download</a>
<a class="btn btn-secondary btn-block d-none d-lg-inline-block o_print_btn o_portal_invoice_print" t-att-href="'/my/invoices/pdf/%s?%s&amp;print=true' % (invoice.id, keep_query())" id="print_invoice_report" title="Print"><i class="fa fa-print"/> Print</a>
</div>
</div>
<hr t-if="invoice.user_id" class="mt0 mb0"/>
addons/account/views/account_view.xml
+2 -2
View File
@@ -531,7 +531,7 @@
</group>
<footer>
<button string="Confirm" name="validate" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
@@ -556,7 +556,7 @@
<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="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</div>
</form>
addons/account/wizard/account_invoice_refund_view.xml
+1 -1
View File
@@ -41,7 +41,7 @@
</group>
<footer>
<button string='Add Credit Note' name="invoice_refund" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_invoice_state_view.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</p>
<footer>
<button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_move_reversal_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button string="Reverse Moves" name="reverse_moves" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_reconcile_view.xml
+2 -2
View File
@@ -20,7 +20,7 @@
<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','&lt;',2)]}" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
@@ -47,7 +47,7 @@
</group>
<footer>
<button string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_report_aged_partner_balance_view.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<field name="journal_ids" required="0" invisible="1"/>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel"/>
<button string="Cancel" class="btn btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_report_common_view.xml
+1 -1
View File
@@ -17,7 +17,7 @@
</group>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel" />
<button string="Cancel" class="btn btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/account/wizard/account_unreconcile_view.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<form class="o_form_label">If you unreconcile transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled</form>
<footer>
<button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_validate_move_view.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<span class="o_form_label">All selected journal entries will be validated and posted. You won't be able to modify them afterwards.</span>
<footer>
<button string="Post Journal Entries" name="validate_move" type="object" default_focus="1" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/multi_compose_message_views.xml
+2 -2
View File
@@ -52,10 +52,10 @@
attrs="{'invisible': ['|', '|', '|', ('is_log', '=', True), ('printed', '=', True), ('is_print', '=', False), ('is_email', '=', True)]}"
name="print_action" type="object" class="btn-primary o_mail_send"/>
<button string="Done" attrs="{'invisible': [('printed', '=', False)]}" special="cancel" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
<button icon="fa-lg fa-save" type="object" name="save_as_template" string="Save as new template"
attrs="{'invisible': ['|', '|', '|', ('is_log', '=', True), ('printed', '=', True), ('is_email', '=', False)]}"
class="pull-right btn-default" help="Save as a new template" />
class="pull-right btn-secondary" help="Save as a new template" />
</footer>
</form>
</field>
addons/account/wizard/pos_box.xml
+2 -2
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="run" string="Put Money In" type="object" class="btn-primary"/>
<button special="cancel" string="Cancel" class="btn-default"/>
<button special="cancel" string="Cancel" class="btn-secondary"/>
</footer>
</form>
</field>
@@ -41,7 +41,7 @@
<footer>
<button name="run" string="Take Money Out" type="object" class="btn-primary"/>
<button class="btn-default" special="cancel" string="Cancel" />
<button class="btn-secondary" special="cancel" string="Cancel" />
</footer>
</form>
</field>
addons/account/wizard/wizard_tax_adjustments_view.xml
+2 -2
View File
@@ -29,11 +29,11 @@
<footer>
<div attrs="{'invisible': [('adjustment_type', '=', 'credit')]}">
<button name="create_move_debit" string="Create and post move" type="object" default_focus="1" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel" />
<button string="Cancel" class="btn btn-secondary" special="cancel" />
</div>
<div attrs="{'invisible': [('adjustment_type', '!=', 'credit')]}">
<button name="create_move_credit" string="Create and post move" type="object" default_focus="1" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel" />
<button string="Cancel" class="btn btn-secondary" special="cancel" />
</div>
</footer>
</form>
addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml
+1 -1
View File
@@ -16,7 +16,7 @@
</group>
<footer>
<button string="Generate Entries" name="asset_compute" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account_asset/wizard/asset_modify_views.xml
+1 -1
View File
@@ -22,7 +22,7 @@
</group>
<footer>
<button name="modify" string="Modify" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account_bank_statement_import/account_bank_statement_import_view.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<field name="filename" invisible="1"/>
<footer>
<button name="import_file" string="_Import" type="object" class="btn-primary" />
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account_bank_statement_import/wizard/journal_creation.xml
+1 -1
View File
@@ -22,7 +22,7 @@
</group>
<footer>
<button name="create_journal" string="OK" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="print_checks" string="Print" type="object" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel"/>
<button string="Cancel" class="btn btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/base_gengo/wizard/base_gengo_translations_view.xml
+1 -1
View File
@@ -23,7 +23,7 @@
</group>
<footer>
<button name="act_update" string="Send" type="object" class="btn-primary"/>
<button name="act_cancel" special="cancel" string="Cancel" type="object" class="btn-default"/>
<button name="act_cancel" special="cancel" string="Cancel" type="object" class="btn-secondary"/>
</footer>
</form>
</field>
addons/base_import/static/src/js/import_action.js
+1 -1
View File
@@ -298,7 +298,7 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
var self = this;
this.$buttons.filter('.oe_import_file')
.text(_t('Load New File'))
.removeClass('btn-primary').addClass('btn-default')
.removeClass('btn-primary').addClass('btn-secondary')
.blur();
this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').removeClass('d-none');
this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('d-none');
addons/base_import/static/src/xml/base_import.xml
+4 -4
View File
@@ -94,10 +94,10 @@
<t t-name="ImportView.buttons">
<button type="button" class="btn btn-primary o_import_import d-none">Import</button>
<button type="button" class="btn btn-default o_import_validate d-none">Test Import</button>
<button type="button" class="btn btn-secondary o_import_validate d-none">Test Import</button>
<button type="button" class="btn btn-primary oe_import_file">Load File</button>
<button type="button" class="btn btn-default o_import_file_reload d-none">Reload File</button>
<button type="button" class="btn btn-default o_import_cancel">Cancel</button>
<button type="button" class="btn btn-secondary o_import_file_reload d-none">Reload File</button>
<button type="button" class="btn btn-secondary o_import_cancel">Cancel</button>
</t>
<t t-name="ImportView.preview">
@@ -155,7 +155,7 @@
<t t-if="error.moreinfo" t-raw="info(error.moreinfo)"/>
</t>
<t t-name="ImportView.import_button">
<button t-if='widget and widget.importEnabled' type="button" class="btn btn-default o_button_import">
<button t-if='widget and widget.importEnabled' type="button" class="btn btn-secondary o_button_import">
Import
</button>
</t>
addons/base_import_module/views/base_import_module_view.xml
+2 -2
View File
@@ -20,11 +20,11 @@
<footer>
<div states="init">
<button name="import_module" string="Import App" type="object" class="btn-primary"/>
<button special="cancel" string="Cancel" class="btn-default"/>
<button special="cancel" string="Cancel" class="btn-secondary"/>
</div>
<div states="done">
<button name="action_module_open" string="Open Modules" type="object" class="btn-primary"/>
<button special="cancel" string="Close" class="btn-default"/>
<button special="cancel" string="Close" class="btn-secondary"/>
</div>
</footer>
</form>
addons/crm/views/crm_lead_views.xml
+1 -1
View File
@@ -248,7 +248,7 @@
<footer>
<button string="Create" name="close_dialog" type="object" class="btn-primary"/>
<button string="Create &amp; Edit" name="edit_dialog" type="object" class="btn-primary"/>
<button string="Discard" class="btn-default" special="cancel"/>
<button string="Discard" class="btn-secondary" special="cancel"/>
</footer>
<field name="partner_name" invisible="1"/>
<field name="contact_name" invisible="1"/>
addons/crm/wizard/crm_lead_lost_views.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</group>
<footer>
<button name="action_lost_reason_apply" string="Submit" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/crm/wizard/crm_lead_to_opportunity_views.xml
+2 -2
View File
@@ -37,7 +37,7 @@
</group>
<footer>
<button name="action_apply" string="Create Opportunity" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
@@ -85,7 +85,7 @@
</group>
<footer>
<button name="mass_convert" string="Convert to Opportunities" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/crm/wizard/crm_merge_opportunities_views.xml
+1 -1
View File
@@ -27,7 +27,7 @@
</group>
<footer>
<button name="action_merge" type="object" string="Merge" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/crm_project/wizard/crm_lead_convert2task_views.xml
+1 -1
View File
@@ -12,7 +12,7 @@
</group>
<footer>
<button type="object" name="action_lead_to_project_task" string="Create Task" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/delivery/wizard/choose_delivery_package_views.xml
+1 -1
View File
@@ -16,7 +16,7 @@
</group>
<footer>
<button name="put_in_pack" type="object" string="Save" class="btn-primary"/>
<button string="Discard" special="cancel" class="btn-default"/>
<button string="Discard" special="cancel" class="btn-secondary"/>
</footer>
</form>
</field>
addons/event/wizard/event_confirm_view.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<span class="o_form_label">Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?</span>
<footer>
<button name="confirm" string="Confirm Anyway" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/event_sale/wizard/event_edit_registration.xml
+1 -1
View File
@@ -20,7 +20,7 @@
</field>
<footer>
<button string="Apply" name="action_make_registration" type="object" class="btn-primary"/>
<button string="Skip" class="btn-default" special="cancel"/>
<button string="Skip" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/gamification/wizard/grant_badge.xml
+1 -1
View File
@@ -12,7 +12,7 @@
</group>
<footer>
<button string="Grant Badge" type="object" name="action_grant_badge" class="btn-primary" />
<button string="Cancel" special="cancel" class="btn-default"/>
<button string="Cancel" special="cancel" class="btn-secondary"/>
</footer>
</form>
</field>
addons/gamification/wizard/update_goal.xml
+1 -1
View File
@@ -11,7 +11,7 @@
</group>
<footer>
<button string="Update" type="object" name="action_update_current" class="btn-primary" />
<button string="Cancel" special="cancel" class="btn-default"/>
<button string="Cancel" special="cancel" class="btn-secondary"/>
</footer>
</form>
</field>
addons/google_calendar/static/src/js/google_calendar.js
+1 -1
View File
@@ -115,7 +115,7 @@ CalendarRenderer.include({
this.$googleButton = $();
if (this.model === "calendar.event") {
this.$googleButton = $('<button/>', {type: 'button', html: _t("Sync with <b>Google</b>")})
.addClass('o_google_sync_button oe_button btn btn-default')
.addClass('o_google_sync_button oe_button btn btn-secondary')
.prepend($('<img/>', {
src: "/google_calendar/static/src/img/calendar_32.png",
}))
addons/hr_attendance/static/src/scss/hr_attendance.scss
+3 -3
View File
@@ -94,7 +94,7 @@
border-radius: .1em;
box-shadow: inset 0 -3px 0 fade-out(black, 0.7);
&.btn-default:hover {
&.btn-secondary:hover {
color: $o-brand-optional;
}
}
@@ -109,7 +109,7 @@
}
}
.d-none.d-md-inline-block.btn-default {
.d-none.d-md-inline-block.btn-secondary {
transform: translate(-50%, -50%);
@include o-position-absolute(0, $left:0);
width: 2em;
@@ -125,7 +125,7 @@
}
}
.btn-default{
.btn-secondary{
box-shadow: inset 0 0 0 1px fade-out(black, 0.9);
color: $headings-color;
}
addons/hr_attendance/static/src/xml/attendance.xml
+6 -6
View File
@@ -43,7 +43,7 @@
<h1 class="mb8"><t t-esc="widget.employee.name"/></h1>
<h3 class="mt8 mb24"><t t-if="!checked_in">Welcome!</t><t t-else="">Want to check out?</t></h3>
<a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-out btn-warning" t-if="checked_in" aria-label="Sign out" title="Sign out"/>
<a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-in btn-default" t-if="!checked_in" aria-label="Sign in" title="Sign in"/>
<a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-in btn-secondary" t-if="!checked_in" aria-label="Sign in" title="Sign in"/>
<h3 class="mt0 mb0 text-muted">Click to <b t-if="checked_in">check out</b><b t-if="!checked_in">check in</b></h3>
</t>
<t t-else="">
@@ -60,8 +60,8 @@
<div class="o_hr_attendance_kiosk_mode">
<t t-set="checked_in" t-value="widget.employee_state=='checked_in'"/>
<div class="o_hr_attendance_back_button">
<span class="btn btn-default btn-lg d-block d-md-none"><i class="fa fa-chevron-left mr8"/> Go back</span>
<span class="btn btn-default d-none d-md-inline-block"><i class="fa fa-chevron-left" role="img" aria-label="Go back" title="Go back"/></span>
<span class="btn btn-secondary btn-lg d-block d-md-none"><i class="fa fa-chevron-left mr8"/> Go back</span>
<span class="btn btn-secondary d-none d-md-inline-block"><i class="fa fa-chevron-left" role="img" aria-label="Go back" title="Go back"/></span>
</div>
<t t-if="widget.employee_id">
<div class="o_hr_attendance_user_badge o_home_menu_background">
@@ -71,7 +71,7 @@
<h3 class="mt8 mb24"><t t-if="!checked_in">Welcome!</t><t t-else="">Want to check out?</t></h3>
<t t-if="!widget.use_pin">
<a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-out btn-warning" t-if="checked_in" aria-label="Sign out" title="Sign out"/>
<a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-in btn-default" t-if="!checked_in" aria-label="Sign in" title="Sign in"/>
<a class="fa fa-7x o_hr_attendance_sign_in_out_icon fa-sign-in btn-secondary" t-if="!checked_in" aria-label="Sign in" title="Sign in"/>
<h3 class="mt0 mb0 text-muted">Click to <b t-if="checked_in">check out</b><b t-else="">check in</b></h3>
</t>
<t t-else="">
@@ -84,7 +84,7 @@
<div class="row">
<t t-foreach="['1', '2', '3', '4', '5', '6', '7', '8', '9', ['C', 'btn-warning'], '0', ['ok', 'btn-primary']]" t-as="btn_name">
<div class="col-xs-4 mb4">
<a t-attf-class="btn {{btn_name[1]? btn_name[1] : 'btn-default'}} btn-block btn-lg {{ 'o_hr_attendance_pin_pad_button_' + btn_name[0] }}"><t t-esc="btn_name[0]"/></a>
<a t-attf-class="btn {{btn_name[1]? btn_name[1] : 'btn-secondary'}} btn-block btn-lg {{ 'o_hr_attendance_pin_pad_button_' + btn_name[0] }}"><t t-esc="btn_name[0]"/></a>
</div>
</t>
</div>
@@ -134,7 +134,7 @@
</t>
<t t-else="">
<div class="alert alert-warning" role="alert">Invalid request, please return to the main menu.</div>
<button class="o_hr_attendance_button_dismiss btn btn-default btn-lg">Go back</button>
<button class="o_hr_attendance_button_dismiss btn btn-secondary btn-lg">Go back</button>
</t>
</div>
</div>
addons/hr_expense/wizard/hr_expense_sheet_register_payment.xml
+1 -1
View File
@@ -32,7 +32,7 @@
</sheet>
<footer>
<button string='Validate' name="expense_post_payment" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/hr_gamification/wizard/gamification_badge_user_wizard_views.xml
+1 -1
View File
@@ -31,7 +31,7 @@
</group>
<footer>
<button string="Reward Employee" type="object" name="action_grant_badge" class="btn-primary" />
<button string="Cancel" special="cancel" class="btn-default"/>
<button string="Cancel" special="cancel" class="btn-secondary"/>
</footer>
</form>
</field>
addons/hr_holidays/wizard/hr_holidays_summary_department_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="print_report" string="Print" type="object" class="btn-primary"/>
<button string="Cancel" special="cancel" class="btn-default"/>
<button string="Cancel" special="cancel" class="btn-secondary"/>
</footer>
</form>
</field>
addons/hr_holidays/wizard/hr_holidays_summary_employees_views.xml
+1 -1
View File
@@ -15,7 +15,7 @@
</group>
<footer>
<button name="print_report" string="Print" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/hr_payroll/wizard/hr_payroll_contribution_register_report_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="print_report" string="Print" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/hr_recruitment/views/hr_recruitment_views.xml
+1 -1
View File
@@ -451,7 +451,7 @@
</group>
<footer>
<button string="Create" name="close_dialog" type="object" class="btn-primary"/>
<button string="Discard" class="btn-default" special="cancel"/>
<button string="Discard" class="btn-secondary" special="cancel"/>
</footer>
</sheet>
</form>
addons/l10n_eu_service/wizard/wizard.xml
+1 -1
View File
@@ -36,7 +36,7 @@
<footer>
<button string="Create Fiscal Positions and Taxes"
name="generate_eu_service" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/l10n_fr_fec/wizard/account_fr_fec_view.xml
+1 -1
View File
@@ -108,7 +108,7 @@
<footer>
<button string="Generate" name="generate_fec" type="object"
class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel"/>
<button string="Cancel" class="btn btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<span class="o_form_label">This wizard will print report which displays employees break-up of Net Head for a specified dates.</span>
<footer>
<button name="print_report" string="Print" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
<group>
<field name="start_date"/>
addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<span class="o_form_label">This wizard will print report which display a pay head employee breakup for a specified dates.</span>
<footer>
<button name="print_report" string="Print" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
<group>
<field name="date_from"/>
addons/lunch/wizard/lucky_order_view.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</group>
<footer>
<button name="random_pick" string="I'm feeling lucky" type="object" class="oe_highlight"/>
<button string="Cancel" class="btn btn-default" special="cancel" />
<button string="Cancel" class="btn btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/mail/static/src/js/discuss_mobile.js
+2 -2
View File
@@ -207,9 +207,9 @@ Discuss.include({
.removeClass('o_hidden');
self.$('.o_mailbox_inbox_item')
.removeClass('btn-primary')
.addClass('btn-default');
.addClass('btn-secondary');
self.$('.o_mailbox_inbox_item[data-type=' + type + ']')
.removeClass('btn-default')
.removeClass('btn-secondary')
.addClass('btn-primary');
} else {
self.$('.o_mail_discuss_mobile_mailboxes_buttons')
addons/mail/static/src/scss/discuss.scss
+1 -1
View File
@@ -277,7 +277,7 @@
width: 50%;
padding: 2%;
&.btn-default {
&.btn-secondary {
border-bottom: 1px solid $gray-lighter-darker
}
}
addons/mail/static/src/xml/activity.xml
+1 -1
View File
@@ -65,7 +65,7 @@
<a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover">
<i class="fa fa-check"/> Mark Done
</a>
<a role="button" href="#" class="btn btn-link btn-default text-muted o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
<a role="button" href="#" class="btn btn-link btn-secondary text-muted o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
<i class="fa fa-pencil"/> Edit
</a>
<a role="button" href="#" class="btn btn-link btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id">
addons/mail/static/src/xml/discuss.xml
+10 -10
View File
@@ -182,15 +182,15 @@
<t t-name="mail.discuss.ControlButtons">
<div>
<button type="button" class="btn btn-primary o_mail_discuss_button_invite d-none d-md-inline-block" title="Invite people">Invite</button>
<button type="button" class="btn btn-default o_mail_discuss_button_mark_all_read d-none d-md-inline-block" title="Mark all as read">Mark all read</button>
<button type="button" class="btn btn-default o_mail_discuss_button_unstar_all" title="Unstar all messages">Unstar all</button>
<button type="button" class="btn btn-default o_mail_discuss_button_dm d-block d-md-none" title="New Message">New Message</button>
<button t-if="!disableAddThread" type="button" class="btn btn-default o_mail_discuss_button_public o_mail_discuss_button_private d-block d-md-none" title="New Channel">New Channel</button>
<button type="button" class="btn btn-default o_hidden o_mail_discuss_button_select_all" title="Select all messages to moderate">Select All</button>
<button type="button" class="btn btn-default o_hidden o_mail_discuss_button_unselect_all" title="Unselect all messages to moderate">Unselect All</button>
<button type="button" data-decision="accept" class="btn btn-default o_mail_discuss_button_moderate_all" title="Accept selected messages">Accept</button>
<button type="button" data-decision="reject" class="btn btn-default o_mail_discuss_button_moderate_all" title="Reject selected messages">Reject</button>
<button type="button" data-decision="discard" class="btn btn-default o_mail_discuss_button_moderate_all" title="Discard selected messages">Discard</button>
<button type="button" class="btn btn-secondary o_mail_discuss_button_mark_all_read d-none d-md-inline-block" title="Mark all as read">Mark all read</button>
<button type="button" class="btn btn-secondary o_mail_discuss_button_unstar_all" title="Unstar all messages">Unstar all</button>
<button type="button" class="btn btn-secondary o_mail_discuss_button_dm d-block d-md-none" title="New Message">New Message</button>
<button t-if="!disableAddThread" type="button" class="btn btn-secondary o_mail_discuss_button_public o_mail_discuss_button_private d-block d-md-none" title="New Channel">New Channel</button>
<button type="button" class="btn btn-secondary o_hidden o_mail_discuss_button_select_all" title="Select all messages to moderate">Select All</button>
<button type="button" class="btn btn-secondary o_hidden o_mail_discuss_button_unselect_all" title="Unselect all messages to moderate">Unselect All</button>
<button type="button" data-decision="accept" class="btn btn-secondary o_mail_discuss_button_moderate_all" title="Accept selected messages">Accept</button>
<button type="button" data-decision="reject" class="btn btn-secondary o_mail_discuss_button_moderate_all" title="Reject selected messages">Reject</button>
<button type="button" data-decision="discard" class="btn btn-secondary o_mail_discuss_button_moderate_all" title="Discard selected messages">Discard</button>
</div>
</t>
@@ -211,7 +211,7 @@
<button type="button" class="btn btn-primary d-inline d-md-none o_mailbox_inbox_item" title="Inbox" data-type="mailbox_inbox">
Inbox
</button>
<button type="button" class="btn btn-default d-inline d-md-none o_mailbox_inbox_item" title="Starred" data-type="mailbox_starred">
<button type="button" class="btn btn-secondary d-inline d-md-none o_mailbox_inbox_item" title="Starred" data-type="mailbox_starred">
Starred
</button>
</div>
addons/mail/static/src/xml/systray.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<ul class="o_mail_systray_dropdown dropdown-menu" role="menu">
<li role="menuitem" t-if="widget.isMobile()">
<div class="o_mail_systray_mobile_header">
<button type="button" class="btn btn-default o_new_message"> New message </button>
<button type="button" class="btn btn-secondary o_new_message"> New message </button>
</div>
</li>
<li role="menuitem" t-if="!widget.isMobile()" class="o_mail_systray_dropdown_top">
addons/mail/static/tests/discuss_moderation_tests.js
+1 -1
View File
@@ -507,7 +507,7 @@ QUnit.test('moderator: discard pending moderation message (reject without explan
"should have two buttons in the footer of the dialog");
assert.strictEqual($('.modal-footer button.btn-primary').text(), "Ok",
"should have a confirm button in the dialog for discard");
assert.strictEqual($('.modal-footer button.btn-default').text(), "Cancel",
assert.strictEqual($('.modal-footer button.btn-secondary').text(), "Cancel",
"should have a cancel button in the dialog for discard");
// discard mesage
addons/mail/views/mail_activity_views.xml
+3 -3
View File
@@ -115,9 +115,9 @@
<button string="Schedule" name="action_close_dialog"
type="object" class="btn-primary"/>
<button string="Mark as Done" name="action_done"
type="object" class="btn-default"/>
<button string="Done &amp; Schedule Next" name="action_done_schedule_next" type="object" class="btn-default"/>
<button string="Discard" class="btn-default" special="cancel" />
type="object" class="btn-secondary"/>
<button string="Done &amp; Schedule Next" name="action_done_schedule_next" type="object" class="btn-secondary"/>
<button string="Discard" class="btn-secondary" special="cancel" />
</footer>
</sheet>
</form>
addons/mail/views/mail_channel_views.xml
+1 -1
View File
@@ -68,7 +68,7 @@
<field name="description"/>
</p>
<button type="object" attrs="{'invisible':['|', ('is_subscribed','=',True), ('group_ids', '!=', [])]}" class="btn btn-primary pull-right" name="channel_join_and_get_info">Join</button>
<button type="object" attrs="{'invisible':['|', ('is_subscribed','=',False), ('group_ids', '!=', [])]}" class="btn btn-default pull-right" name="action_unfollow">Leave</button>
<button type="object" attrs="{'invisible':['|', ('is_subscribed','=',False), ('group_ids', '!=', [])]}" class="btn btn-secondary pull-right" name="action_unfollow">Leave</button>
</div>
</div>
</t>
addons/mail/wizard/email_template_preview_view.xml
+1 -1
View File
@@ -29,7 +29,7 @@
nolabel="1" options='{"safe": True}'/>
<field name="attachment_ids" widget="many2many_binary" readonly="1"/>
<footer>
<button string="Discard" class="btn-default" special="cancel"/>
<button string="Discard" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/mail/wizard/invite_view.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<footer>
<button string="Add Followers"
name="add_followers" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/mail/wizard/mail_compose_message_view.xml
+2 -2
View File
@@ -76,10 +76,10 @@
<footer>
<button string="Send" attrs="{'invisible': [('is_log', '=', True)]}" name="send_mail_action" type="object" class="btn-primary o_mail_send"/>
<button string="Log" attrs="{'invisible': [('is_log', '=', False)]}" name="send_mail_action" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
<button icon="fa-lg fa-save" type="object" name="save_as_template" string="Save as new template"
class="pull-right btn-default" help="Save as a new template"/>
class="pull-right btn-secondary" help="Save as a new template"/>
</footer>
</form>
</field>
addons/mail/wizard/mail_resend_message_views.xml
+3 -3
View File
@@ -23,8 +23,8 @@
<p attrs="{'invisible':[('has_cancel', '==', False)]}"> <span class="fa fa-info-circle"/> Caution: It won't be possible to send this mail again to the recipients you did not select.</p>
<footer>
<button string="Resend to selected" name="resend_mail_action" type="object" class="btn-primary o_mail_send"/>
<button string="Ignore all failures" name="cancel_mail_action" type="object" class="btn-default" />
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Ignore all failures" name="cancel_mail_action" type="object" class="btn-secondary" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
@@ -41,7 +41,7 @@
<img src="/mail/static/img/red_envelope.png" alt="Envelope Example"/>
<footer>
<button string="Discard delivery failures" name="cancel_resend_action" type="object" class="btn-primary" />
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/mass_mailing/views/mass_mailing_views.xml
+4 -4
View File
@@ -278,7 +278,7 @@
</group>
<footer>
<button string="Create" name="close_dialog" type="object" class="btn-primary"/>
<button string="Discard" class="btn-default" special="cancel"/>
<button string="Discard" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
@@ -413,9 +413,9 @@
<header style="min-height:31px;">
<button name="put_in_queue" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="oe_highlight" string="Send Now"
confirm="This will send the email to all recipients. Do you still want to proceed ?"/>
<button name="action_schedule_date" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="btn-default" string="Schedule"/>
<button name="action_test_mailing" type="object" class="btn-default" string="Test"/>
<button name="cancel_mass_mailing" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="btn-default" string="Cancel"/>
<button name="action_schedule_date" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="btn-secondary" string="Schedule"/>
<button name="action_test_mailing" type="object" class="btn-secondary" string="Test"/>
<button name="cancel_mass_mailing" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="btn-secondary" string="Cancel"/>
<button name="retry_failed_mail" type="object" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}" class="oe_highlight" string="Retry"/>
<field name="state" readonly="1" widget="statusbar"/>
addons/mass_mailing/wizard/mass_mailing_list_merge_views.xml
+1 -1
View File
@@ -20,7 +20,7 @@
</field>
<footer>
<button name="action_mailing_lists_merge" type="object" string="Merge" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/mass_mailing/wizard/mass_mailing_schedule_date_views.xml
+1 -1
View File
@@ -12,7 +12,7 @@
</group>
<footer>
<button string="Schedule" name="set_schedule_date" type="object" class="btn-primary"/>
<button string="Discard " class="btn-default" special="cancel" />
<button string="Discard " class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/mass_mailing/wizard/test_mailing_views.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</group>
<footer>
<button string="Send Sample Mail" name="send_mail_test" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/membership/wizard/membership_invoice_views.xml
+1 -1
View File
@@ -12,7 +12,7 @@
</group>
<footer>
<button string="Invoice Membership" name="membership_invoice" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/mrp/wizard/change_production_qty_views.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<footer>
<button name="change_prod_qty" string="Approve"
colspan="1" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/mrp/wizard/mrp_product_produce_views.xml
+1 -1
View File
@@ -36,7 +36,7 @@
</group>
<footer>
<button name="do_produce" type="object" string="Record Production" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/mrp/wizard/mrp_workcenter_block_view.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="button_block" string="Block" type="object" class="btn-danger text-uppercase"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/payment/views/payment_templates.xml
+1 -1
View File
@@ -141,7 +141,7 @@
</t>
</div>
<div t-if='back_button_txt' class="pull-left">
<a role="button" t-att-href="back_button_link or '#'" t-att-class="back_button_class or 'btn btn-lg btn-default'">
<a role="button" t-att-href="back_button_link or '#'" t-att-class="back_button_class or 'btn btn-lg btn-secondary'">
<i t-if="back_button_icon_class" t-attf-class="fa {{back_button_icon_class}}"/>
<t t-esc="back_button_txt"/>
</a>
addons/payment/views/payment_views.xml
+1 -1
View File
@@ -153,7 +153,7 @@
<t t-if="installed">
<field name="environment" widget="label_selection" options="{'classes': {'test': 'warning', 'production': 'success'}}"/>
</t>
<button t-if="!installed" type="object" class="btn btn-default pull-right" name="button_immediate_install">Install</button>
<button t-if="!installed" type="object" class="btn btn-secondary pull-right" name="button_immediate_install">Install</button>
<button t-if="installed and !record.website_published.raw_value" type="edit" class="btn btn-primary pull-right">Activate</button>
<button t-if="installed and record.website_published.raw_value" type="edit" class="btn btn-primary pull-right">Configure</button>
</div>
addons/point_of_sale/views/point_of_sale_dashboard.xml
+1 -1
View File
@@ -92,7 +92,7 @@
<button t-if="record.current_session_state.raw_value === 'opening_control'" class="btn btn-primary" name="open_existing_session_cb" type="object">Open Session</button>
<button t-if="_.contains(['opened', 'closing_control'], record.current_session_state.raw_value)" class="btn btn-default" name="open_existing_session_cb" type="object">Close</button>
<button t-if="_.contains(['opened', 'closing_control'], record.current_session_state.raw_value)" class="btn btn-secondary" name="open_existing_session_cb" type="object">Close</button>
<button t-if="!record.current_session_id.raw_value &amp;&amp; !record.pos_session_username.value" class="btn btn-primary" name="open_session_cb" type="object">New Session</button>
addons/point_of_sale/wizard/pos_details.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</group>
<footer>
<button name="generate_report" string="Print" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/point_of_sale/wizard/pos_discount.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</group>
<footer>
<button name="apply_discount" string="Apply Discount" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/point_of_sale/wizard/pos_open_statement.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<span class="o_form_label">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.</span>
<footer>
<button name="open_statement" type="object" string="Open Registers" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/point_of_sale/wizard/pos_payment.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="check" string="Make Payment" type="object" class="btn-primary"/>
<button special="cancel" string="Cancel" class="btn-default"/>
<button special="cancel" string="Cancel" class="btn-secondary"/>
</footer>
</form>
</field>
addons/portal/static/src/scss/portal.scss
-2
View File
@@ -306,7 +306,6 @@ img.o_we_custom_image {
margin-bottom: 0;
background-color: $table-bg-active;
padding: 6px 10px $navbar-padding-vertical;
border: 1px solid $btn-default-border;
border-width: 1px 1px 0 1px;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
@@ -323,7 +322,6 @@ img.o_we_custom_image {
@include media-breakpoint-down(sm) {
.navbar-collapse {
z-index: 0;
box-shadow: inset 0 0 0 1px $btn-default-border;
background-color: $table-bg-active;
border-radius: $btn-border-radius-base;
border-top-right-radius: 0;
addons/portal/views/portal_templates.xml
+8 -8
View File
@@ -100,7 +100,7 @@
<t t-call="portal.portal_contact"/>
</div>
<div class="o_portal_my_details">
<h3 class="page-header">Your Details <a role="button" href="/my/account" class="btn btn-default btn-xs">Change</a></h3>
<h3 class="page-header">Your Details <a role="button" href="/my/account" class="btn btn-secondary btn-xs">Change</a></h3>
<div t-field="user_id.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/>
</div>
<div class="o_my_archives" t-if="archive_groups">
@@ -175,7 +175,7 @@
<ul class="nav pull-left">
<t t-raw="0"/>
<li t-if="searchbar_sortings" class="dropdown pull-left ml16">
<button id="portal_searchbar_sortby" data-toggle="dropdown" class="btn btn-default navbar-btn">
<button id="portal_searchbar_sortby" data-toggle="dropdown" class="btn btn-secondary navbar-btn">
<span class="fa fa-sort"/>
<span class="d-none d-lg-inline"><t t-esc="searchbar_sortings[sortby].get('label', 'Newest')"/></span>
<span class="caret"/>
@@ -189,7 +189,7 @@
</ul>
</li>
<li t-if="searchbar_filters" class="dropdown pull-left ml4">
<button id="portal_searchbar_filters" data-toggle="dropdown" class="btn btn-default navbar-btn">
<button id="portal_searchbar_filters" data-toggle="dropdown" class="btn btn-secondary navbar-btn">
<span class="fa fa-filter"/>
<span class="d-none d-lg-inline"><t t-esc="searchbar_filters[filterby].get('label', 'All')"/></span>
<span class="caret"/>
@@ -203,7 +203,7 @@
</ul>
</li>
<li t-if="searchbar_groupby" class="dropdown pull-left ml4">
<button id="portal_searchbar_groupby" data-toggle="dropdown" class="btn btn-default navbar-btn">
<button id="portal_searchbar_groupby" data-toggle="dropdown" class="btn btn-secondary navbar-btn">
<span class="fa fa-object-group"/>
<span class="d-none d-lg-inline"><t t-esc="searchbar_groupby[groupby].get('label', 'None')"/></span>
<span class="caret"/>
@@ -226,7 +226,7 @@
<div class="navbar-form o_portal_search_panel">
<div class="input-group">
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown">
<span id="search_label" class="d-none d-md-inline mr4">Search</span><span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
@@ -237,7 +237,7 @@
</div>
<input type="text" class="form-control" t-att-value='search' name="search"/>
<span class="input-group-btn">
<button class="btn btn-default search-submit" type="button"><span class="fa fa-search d-none d-md-inline-block"/><span class="fa fa-arrow-right d-inline-block d-md-none"/></button>
<button class="btn btn-secondary search-submit" type="button"><span class="fa fa-search d-none d-md-inline-block"/><span class="fa fa-arrow-right d-inline-block d-md-none"/></button>
</span>
</div>
</div>
@@ -362,8 +362,8 @@
<template id="record_pager" name="Portal Record Pager">
<t t-if='prev_record or next_record'>
<div class="ml8 record_pager btn-group btn-group-xs pull-right" role="group">
<a role="button" t-att-class="'btn btn-default %s' % ('disabled' if not prev_record else '')" t-att-href="prev_record or '#'" ><i class="fa fa-arrow-left" role="img" aria-label="Previous" title="Previous"></i></a>
<a role="button" t-att-class="'btn btn-default %s' % ('disabled' if not next_record else '')" t-att-href="next_record or '#'" ><i class="fa fa-arrow-right" role="img" aria-label="Next" title="Previous"></i></a>
<a role="button" t-att-class="'btn btn-secondary %s' % ('disabled' if not prev_record else '')" t-att-href="prev_record or '#'" ><i class="fa fa-arrow-left" role="img" aria-label="Previous" title="Previous"></i></a>
<a role="button" t-att-class="'btn btn-secondary %s' % ('disabled' if not next_record else '')" t-att-href="next_record or '#'" ><i class="fa fa-arrow-right" role="img" aria-label="Next" title="Previous"></i></a>
</div>
</t>
</template>
addons/portal/wizard/portal_wizard_views.xml
+1 -1
View File
@@ -31,7 +31,7 @@
placeholder="This text is included in the email sent to new portal users."/>
<footer>
<button string="Apply" name="action_apply" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/product/wizard/product_price_list_views.xml
+1 -1
View File
@@ -17,7 +17,7 @@
</group>
<footer>
<button name="print_report" string="Print" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/product_margin/wizard/product_margin_view.xml
+1 -1
View File
@@ -12,7 +12,7 @@
</group>
<footer>
<button name="action_open_window" string="Open Margins" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/project/views/project_portal_templates.xml
+1 -1
View File
@@ -101,7 +101,7 @@
</div>
<div class="col-md-6">
<div class="pull-right">
<a role="button" t-attf-href="/my/tasks?filterby=#{project.id}" class="btn btn-default btn-lg">
<a role="button" t-attf-href="/my/tasks?filterby=#{project.id}" class="btn btn-secondary btn-lg">
<span class="fa fa-tasks" role="img" aria-label="Tasks" title="Tasks"/>
<span t-esc="project.task_count" />
<span t-field="project.label_tasks" />
addons/project/views/project_views.xml
+1 -1
View File
@@ -265,7 +265,7 @@
</group>
<footer>
<button string="Create" name="open_tasks" type="object" class="btn-primary o_open_tasks"/>
<button string="Discard" class="btn-default" special="cancel"/>
<button string="Discard" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/repair/wizard/repair_cancel.py
+1 -1
View File
@@ -33,7 +33,7 @@ class RepairCancel(models.TransientModel):
<form string="Cancel Repair">
<header>
<button name="cancel_repair" string="_Yes" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</header>
<label string="Do you want to continue?"/>
</form>
addons/repair/wizard/repair_cancel_views.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</group>
<footer>
<button name="cancel_repair" string="Yes" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/repair/wizard/repair_make_invoice_views.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</group>
<footer>
<button name="make_invoices" string="Create Invoice" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/sale/wizard/sale_make_invoice_advance_views.xml
+1 -1
View File
@@ -34,7 +34,7 @@
context="{'open_invoices': True}" class="btn-primary"/>
<button name="create_invoices" string="Create Invoices" type="object"
class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel"/>
<button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
addons/sale_timesheet/wizard/project_create_invoice_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button string="Create Invoice" type="object" name="action_create_invoice" class="oe_highlight"/>
<button string="Cancel" special="cancel" type="object" class="btn btn-default oe_inline"/>
<button string="Cancel" special="cancel" type="object" class="btn btn-secondary oe_inline"/>
</footer>
</form>
</field>
addons/sale_timesheet/wizard/project_create_sale_order_views.xml
+1 -1
View File
@@ -17,7 +17,7 @@
</group>
<footer>
<button string="Create Sales Order" type="object" name="action_create_sale_order" class="oe_highlight"/>
<button string="Cancel" special="cancel" type="object" class="btn btn-default oe_inline"/>
<button string="Cancel" special="cancel" type="object" class="btn btn-secondary oe_inline"/>
</footer>
</form>
</field>
addons/sale_timesheet/wizard/project_task_assign_so_line_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button string="Assign" type="object" name="action_assign_sale_line" class="oe_highlight"/>
<button string="Cancel" special="cancel" type="object" class="btn btn-default oe_inline"/>
<button string="Cancel" special="cancel" type="object" class="btn btn-secondary oe_inline"/>
</footer>
</form>
</field>
addons/stock/views/stock_scrap_views.xml
+1 -1
View File
@@ -167,7 +167,7 @@
</group>
<footer>
<button name="action_validate" string="Done" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/stock/wizard/product_replenish_views.xml
+1 -1
View File
@@ -38,7 +38,7 @@
type="object"
class="btn-primary"/>
<button string="Discard"
class="btn-default"
class="btn-secondary"
special="cancel" />
</footer>
</form>
addons/stock/wizard/stock_backorder_confirmation_views.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<footer>
<button name="process" string="Create Backorder" type="object" class="oe_highlight"/>
<button name="process_cancel_backorder" string="No Backorder" type="object" class="btn-primary"/>
<button string="_Cancel" class="btn-default" special="cancel" />
<button string="_Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/stock/wizard/stock_change_product_qty_views.xml
+1 -1
View File
@@ -18,7 +18,7 @@
</group>
<footer>
<button name="change_product_qty" string="_Apply" type="object" class="btn-primary"/>
<button string="_Cancel" class="btn-default" special="cancel" />
<button string="_Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/stock/wizard/stock_immediate_transfer_views.xml
+1 -1
View File
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="process" string="_Apply" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
addons/stock/wizard/stock_overprocessed_transfer_views.xml
+1 -1
View File
@@ -14,7 +14,7 @@
</p>
<footer>
<button name="action_confirm" string="Confirm" type="object" class="btn-primary"/>
<button string="Cancel" special="cancel" class="btn-default"/>
<button string="Cancel" special="cancel" class="btn-secondary"/>
</footer>
</form>
</field>
addons/stock/wizard/stock_picking_return_views.xml
+1 -1
View File
@@ -31,7 +31,7 @@
</group>
<footer>
<button name="create_returns" string="Return" type="object" class="btn-primary"/>
<button string="Cancel" class="btn-default" special="cancel" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>

Some files were not shown because too many files have changed in this diff Show More