diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 601ee58f4dc..c6040f1b0fd 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -443,6 +443,26 @@ body.openerp { padding-left: 10px; } +.openerp .oe-searchview-render-line { + width:100%; +} + +.openerp .searchview_extended_group { + border: #696969 solid 1px; + padding: 3px; + margin: 2px; +} + +.openerp .searchview_extended_add_proposition, .openerp .searchview_extended_add_group { + background: url(../img/icons/gtk-add.png) repeat-y; + padding-left: 18px; +} + +.openerp .searchview_extended_delete_group, .openerp .searchview_extended_delete_prop { + background: url(../img/icons/gtk-remove.png) repeat-y; + padding-left: 18px; +} + /* Notebook */ .openerp .oe_form_notebook { padding: 0px; @@ -673,6 +693,14 @@ body.openerp { } .openerp .kitten-mode-activated { - background: url(http://placekitten.com/g/214/99) repeat; + background: url(http://placekitten.com/g/1500/800) repeat; +} + +.openerp .kitten-mode-activated .header { + background: url(http://placekitten.com/g/211/65) repeat; +} + +.openerp .kitten-mode-activated .secondary_menu { + background: url(http://placekitten.com/g/212/100) repeat; } diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js index 21d1408f087..0f4ab8585b8 100644 --- a/addons/base/static/src/js/search.js +++ b/addons/base/static/src/js/search.js @@ -817,24 +817,27 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({ return; } + var type = field.type; try { - this.value = new (openerp.base.search.custom_filters.get_object(field.type)) - (this); - _.each(this.value.operators, function(operator) { - var option = jQuery('', {value: operator.value}) - .text(operator.text) - .appendTo(_this.$element.find('.searchview_extended_prop_op')); - }); - this.$element.find('.searchview_extended_prop_value').html( - this.value.render({})); - this.value.start(); + openerp.base.search.custom_filters.get_object(type); } catch (e) { if (! e instanceof openerp.base.KeyNotFound) { throw e; } - this.attrs.selected = null; + var type = "char"; this.log('Unknow field type ' + e.key); } + this.value = new (openerp.base.search.custom_filters.get_object(type)) + (this); + _.each(this.value.operators, function(operator) { + var option = jQuery('', {value: operator.value}) + .text(operator.text) + .appendTo(_this.$element.find('.searchview_extended_prop_op')); + }); + this.$element.find('.searchview_extended_prop_value').html( + this.value.render({})); + this.value.start(); + }, get_proposition: function() { if ( this.attrs.selected == null) diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 70dc83f14e2..9c73bbc66f3 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -62,7 +62,7 @@ + 'http://placekitten.com/g/179/46'" border="0" class="company_logo"/> $company - ($database) @@ -385,7 +385,7 @@ - @@ -484,7 +484,7 @@ - + - + - All - Any - None + All the following conditions must match + Any of the following conditions must match + None of the following conditions must match + Delete this group of conditions - Add condition - Delete this group + Add condition