odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[imp] Improved advanced filters design, added setup of manage filters. 

bzr revid: nicolas.vanhoren@openerp.com-20110527102527-p9qfobfo9tcjkvub
This commit is contained in:
niv-openerp 2011-05-27 12:25:27 +02:00
parent d7e17b06cf
commit bcc5393d48
3 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/base/static/src/css/base.css
View File

@ -487,7 +487,13 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
margin: 2px;
}
.openerp .searchview_extended_add_proposition span, .openerp .searchview_extended_add_group span {
.openerp .oe_search-view-custom-filter-btn span {
background: url(../img/icons/gtk-add.png) repeat-y;
padding-left: 18px;
}
.openerp .searchview_extended_add_proposition span {
font-size: 0.9em;
background: url(../img/icons/gtk-add.png) repeat-y;
padding-left: 18px;
}
@ -496,13 +502,10 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
float:right;
}
.openerp .searchview_extended_delete_group span {
background: url(../img/icons/gtk-cancel.png) repeat-y;
padding-left: 18px;
}
.openerp .searchview_extended_delete_group span,
.openerp .searchview_extended_delete_prop span {
background: url(../img/icons/gtk-remove.png) repeat-y;
font-size: 0.9em;
background: url(../img/icons/gtk-close.png) repeat-y;
padding-left: 18px;
}
/* List */

22
addons/base/static/src/js/search.js
View File

@ -135,6 +135,28 @@ openerp.base.SearchView = openerp.base.Controller.extend({
_(lines).chain().flatten().each(function (widget) {
widget.start();
});
// filters management
this.$element.find(".oe_search-view-filters-management").change(this.on_filters_management);
},
/**
* Handle event when the user make a selection in the filters management select box.
*/
on_filters_management: function(e) {
var select = this.$element.find(".oe_search-view-filters-management");
var val = select.val();
select.val("_filters");
if (val.slice(0,1) == "_") // useless action
return;
if (val.slice(0, "get:".length) == "get:") {
val = val.slice("get:".length);
//TODO niv
} else if (val == "save_filter") {
//TODO niv
} else { // manage_filters
//TODO niv
}
},
/**
* Performs the search view collection of widget data.

23
addons/base/static/src/xml/base.xml
View File

@ -566,7 +566,13 @@
<div class="oe_search-view-buttons" style="text-align: right;">
<input type="submit" value="Search"/>
<input type="reset" value="Clear"/>
<button class="oe_search-view-custom-filter-btn">Custom Filters</button>
<button class="oe_search-view-custom-filter-btn"><span>Advanced Filter</span></button>
<select class="oe_search-view-filters-management">
<option value="_filters">-- Filters --</option>
<option value="_actions">-- Actions --</option>
<option value="save_filter">Save Filter</option>
<option value="manage_filters">Manage Filters</option>
</select>
</div>
</form>
</t>
@ -670,12 +676,10 @@
<t t-name="SearchView.extended_search">
<t t-call="SearchView.util.expand">
<t t-set="expand" t-value="false"/>
<t t-set="label" t-value="'Custom Filters'"/>
<t t-set="label" t-value="'Advanced Filters'"/>
<t t-set="content">
<div class="searchview_extended_groups_list">
</div>
<button class="searchview_extended_add_group"
type="button"><span>Add group of conditions</span></button>
</t>
</t>
</t>
@ -686,11 +690,12 @@
<option value="any">Any of the following conditions must match</option>
<option value="none">None of the following conditions must match</option>
</select>
<button class="searchview_extended_delete_group"
type="button"><span></span></button>
<a class="searchview_extended_delete_group"
href="javascript:void(0)"><span></span></a>
<div class="searchview_extended_propositions_list">
</div>
<button class="searchview_extended_add_proposition" type="button"><span>Add condition</span></button>
<a class="searchview_extended_add_proposition" href="javascript:void(0)">
<span>Add condition</span></a>
</div>
</t>
<t t-name="SearchView.extended_search.proposition">
@ -705,8 +710,8 @@
</select>
<select class="searchview_extended_prop_op"/>
<span class="searchview_extended_prop_value"/>
<button class="searchview_extended_delete_prop"
type="button"><span>Delete this condition</span></button>
<a class="searchview_extended_delete_prop"
href="javascript:void(0)"><span></span></a>
</div>
</t>
<t t-name="SearchView.extended_search.proposition.char">