[imp] Changed design of custom filters.
bzr revid: nicolas.vanhoren@openerp.com-20110526153332-7zwf0712g45rakv4
This commit is contained in:
commit
4401a77c5e
|
@ -496,7 +496,12 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
|
|||
float:right;
|
||||
}
|
||||
|
||||
.openerp .searchview_extended_delete_group span, .openerp .searchview_extended_delete_prop span {
|
||||
.openerp .searchview_extended_delete_group span {
|
||||
background: url(../img/icons/gtk-cancel.png) repeat-y;
|
||||
padding-left: 18px;
|
||||
}
|
||||
|
||||
.openerp .searchview_extended_delete_prop span {
|
||||
background: url(../img/icons/gtk-remove.png) repeat-y;
|
||||
padding-left: 18px;
|
||||
}
|
||||
|
|
|
@ -706,7 +706,7 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
|
|||
},
|
||||
add_group: function() {
|
||||
var group = new openerp.base.search.ExtendedSearchGroup(this, this.fields);
|
||||
var render = group.render({'index': this.children.length - 1});
|
||||
var render = group.render();
|
||||
this.$element.find('.searchview_extended_groups_list').append(render);
|
||||
group.start();
|
||||
},
|
||||
|
@ -718,7 +718,6 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
|
|||
{"model": this.model}, function(data) {
|
||||
self.fields = data.fields;
|
||||
openerp.base.search.add_expand_listener(self.$element);
|
||||
self.add_group();
|
||||
self.$element.find('.searchview_extended_add_group').click(function (e) {
|
||||
self.add_group();
|
||||
});
|
||||
|
@ -735,17 +734,20 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
|
|||
function(mem, x) { return mem.concat(x.get_domain());}, []);
|
||||
},
|
||||
on_activate: function() {
|
||||
this.add_group();
|
||||
var table = this.$element.closest("table.oe-searchview-render-line");
|
||||
if (table.css("display") == "none") {
|
||||
if(table.css("display") == "none") {
|
||||
table.css("display", "");
|
||||
if(this.$element.hasClass("folded")) {
|
||||
this.$element.toggleClass("folded expanded");
|
||||
}
|
||||
} else {
|
||||
table.css("display", "none");
|
||||
if(this.$element.hasClass("expanded")) {
|
||||
this.$element.toggleClass("folded expanded");
|
||||
}
|
||||
}
|
||||
},
|
||||
hide: function() {
|
||||
var table = this.$element.closest("table.oe-searchview-render-line");
|
||||
table.css("display", "none");
|
||||
if(this.$element.hasClass("expanded")) {
|
||||
this.$element.toggleClass("folded expanded");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -772,6 +774,9 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
|
|||
});
|
||||
var delete_btn = this.$element.find('.searchview_extended_delete_group');
|
||||
delete_btn.click(function (e) {
|
||||
if (_this.parent.children.length == 1) {
|
||||
_this.parent.hide();
|
||||
}
|
||||
_this.stop();
|
||||
});
|
||||
},
|
||||
|
|
|
@ -644,8 +644,8 @@
|
|||
<option value="any">Any of the following conditions must match</option>
|
||||
<option value="none">None of the following conditions must match</option>
|
||||
</select>
|
||||
<button t-if="index > 0" class="searchview_extended_delete_group"
|
||||
type="button"><span>Delete this group of conditions</span></button>
|
||||
<button class="searchview_extended_delete_group"
|
||||
type="button"><span></span></button>
|
||||
<div class="searchview_extended_propositions_list">
|
||||
</div>
|
||||
<button class="searchview_extended_add_proposition" type="button"><span>Add condition</span></button>
|
||||
|
@ -663,7 +663,7 @@
|
|||
</select>
|
||||
<select class="searchview_extended_prop_op"/>
|
||||
<span class="searchview_extended_prop_value"/>
|
||||
<button t-if="index > 0" class="searchview_extended_delete_prop"
|
||||
<button class="searchview_extended_delete_prop"
|
||||
type="button"><span>Delete this condition</span></button>
|
||||
</div>
|
||||
</t>
|
||||
|
|
Loading…
Reference in New Issue