diff options
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 16 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 14 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list_view.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list_view_editable.js | 8 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 16 |
5 files changed, 23 insertions, 33 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f1b279fd061..fa2772f453f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2340,7 +2340,7 @@ height: auto; line-height: 16px; } -.openerp .oe_form_field_one2many .oe_list_buttons.oe_editing .oe_list_save, .openerp .oe_form_field_many2many .oe_list_buttons.oe_editing .oe_list_save { +.openerp .oe_form_field_one2many .oe_list_buttons.oe_editing .o_list_button_save, .openerp .oe_form_field_many2many .oe_list_buttons.oe_editing .o_list_button_save { visibility: hidden; } .openerp .oe_form_editable .oe_list_editable .oe_list_content td.oe_required { @@ -2417,24 +2417,18 @@ .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } -.openerp .oe_list_buttons .oe_alternative { - visibility: hidden; -} -.openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard { +.openerp .oe_list_buttons .o_list_button_save, .openerp .oe_list_buttons .o_list_button_discard { display: none; } -.openerp .oe_list_buttons.oe_editing .oe_list_add { +.openerp .oe_list_buttons.oe_editing .o_list_button_add { display: none; } -.openerp .oe_list_buttons.oe_editing .oe_list_save { +.openerp .oe_list_buttons.oe_editing .o_list_button_save { display: inline-block; } -.openerp .oe_list_buttons.oe_editing .oe_list_discard { +.openerp .oe_list_buttons.oe_editing .o_list_button_discard { display: inline; } -.openerp .oe_list_buttons.oe_editing .oe_alternative { - visibility: visible; -} .openerp .oe_list.oe_cannot_edit .oe_list_header_handle, .openerp .oe_list.oe_cannot_edit .oe_list_field_handle { display: none !important; padding: 0 !important; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index db6f463ac43..f64c0985fea 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1925,7 +1925,7 @@ $sheet-padding: 16px li height: auto line-height: 16px - .oe_list_buttons.oe_editing .oe_list_save + .oe_list_buttons.oe_editing .o_list_button_save // keep "save row" button hidden in o2m visibility: hidden .oe_form_editable @@ -1993,19 +1993,15 @@ $sheet-padding: 16px // }}} // ListView {{{ .oe_list_buttons - .oe_alternative - visibility: hidden - .oe_list_save, .oe_list_discard + .o_list_button_save, .o_list_button_discard display: none &.oe_editing - .oe_list_add + .o_list_button_add display: none - .oe_list_save + .o_list_button_save display: inline-block - .oe_list_discard + .o_list_button_discard display: inline - .oe_alternative - visibility: visible .oe_list &.oe_cannot_edit diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js index 95e6f08d6b6..e7439da3487 100644 --- a/addons/web/static/src/js/views/list_view.js +++ b/addons/web/static/src/js/views/list_view.js @@ -278,7 +278,7 @@ var ListView = View.extend( /** @lends instance.web.ListView# */ { if (!this.$buttons) { this.$buttons = $(QWeb.render("ListView.buttons", {'widget': this})); - this.$buttons.find('.oe_list_add').click(this.proxy('do_add_record')); + this.$buttons.find('.o_list_button_add').click(this.proxy('do_add_record')); $node = $node || this.options.$buttons; if ($node) { diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js index ae3cd33f4c3..d63151e880e 100644 --- a/addons/web/static/src/js/views/list_view_editable.js +++ b/addons/web/static/src/js/views/list_view_editable.js @@ -312,10 +312,10 @@ ListView.include(/** @lends instance.web.ListView# */{ this._super.apply(this, arguments); // Sets this.$buttons if (add_button && this.editable()) { this.$buttons - .off('click', '.oe_list_save') - .on('click', '.oe_list_save', this.proxy('save_edition')) - .off('click', '.oe_list_discard') - .on('click', '.oe_list_discard', function (e) { + .off('click', '.o_list_button_save') + .on('click', '.o_list_button_save', this.proxy('save_edition')) + .off('click', '.o_list_button_discard') + .on('click', '.o_list_button_discard', function (e) { e.preventDefault(); self.cancel_edition(); }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 8217607f197..c7d3894e81a 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -705,7 +705,7 @@ <t t-name="ListView.buttons"> <t t-if="!widget.no_leaf and widget.options.action_buttons !== false and widget.options.addable and widget.is_action_enabled('create')"> <div class="oe_list_buttons"> - <button type="button" class="oe_list_add btn btn-primary btn-sm"> + <button type="button" class="btn btn-sm btn-primary o_list_button_add"> <t t-esc="widget.options.addable"/> </button> </div> @@ -745,13 +745,13 @@ </td> </tr> <t t-extend="ListView.buttons"> - <t t-jquery="button.oe_list_add" t-operation="after"> - <button class="oe_button oe_list_save oe_highlight" - type="button">Save</button> - <span class="oe_alternative"> - <span class="oe_fade">or</span> - <a href="#" class="oe_bold oe_list_discard">Discard</a> - </span> + <t t-jquery="button.o_list_button_add" t-operation="after"> + <button type="button" class="btn btn-primary btn-sm o_list_button_save"> + Save + </button> + <button type="button" class="btn btn-default btn-sm o_list_button_discard"> + Discard + </button> </t> </t> <button t-name="ListView.row.text_button" type="button" |
