[IMP] Improved custom filters design.
bzr revid: nicolas.vanhoren@openerp.com-20110412162703-op0kbnqhhgikygej
This commit is contained in:
parent
4eeaca9e6d
commit
f3ef034ac2
|
@ -443,6 +443,26 @@ body.openerp {
|
||||||
padding-left: 10px;
|
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 */
|
/* Notebook */
|
||||||
.openerp .oe_form_notebook {
|
.openerp .oe_form_notebook {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
|
@ -673,6 +693,14 @@ body.openerp {
|
||||||
}
|
}
|
||||||
|
|
||||||
.openerp .kitten-mode-activated {
|
.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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -817,24 +817,27 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var type = field.type;
|
||||||
try {
|
try {
|
||||||
this.value = new (openerp.base.search.custom_filters.get_object(field.type))
|
openerp.base.search.custom_filters.get_object(type);
|
||||||
(this);
|
|
||||||
_.each(this.value.operators, function(operator) {
|
|
||||||
var option = jQuery('<option>', {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();
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (! e instanceof openerp.base.KeyNotFound) {
|
if (! e instanceof openerp.base.KeyNotFound) {
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
this.attrs.selected = null;
|
var type = "char";
|
||||||
this.log('Unknow field type ' + e.key);
|
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('<option>', {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() {
|
get_proposition: function() {
|
||||||
if ( this.attrs.selected == null)
|
if ( this.attrs.selected == null)
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
<t t-name="Header">
|
<t t-name="Header">
|
||||||
<a href="/" class="company_logo_link">
|
<a href="/" class="company_logo_link">
|
||||||
<img t-att-src="typeof kitten == 'undefined' ? '/base/static/src/img/logo.png' :
|
<img t-att-src="typeof kitten == 'undefined' ? '/base/static/src/img/logo.png' :
|
||||||
'http://placekitten.com/180/46'" border="0" class="company_logo"/>
|
'http://placekitten.com/g/179/46'" border="0" class="company_logo"/>
|
||||||
</a>
|
</a>
|
||||||
<h1 class="header_title" t-if="session.session_is_valid()">
|
<h1 class="header_title" t-if="session.session_is_valid()">
|
||||||
<span class="company">$company</span> - (<span class="database">$database</span>)<br/>
|
<span class="company">$company</span> - (<span class="database">$database</span>)<br/>
|
||||||
|
@ -385,7 +385,7 @@
|
||||||
</form>
|
</form>
|
||||||
</t>
|
</t>
|
||||||
<t t-name="SearchView.render_lines">
|
<t t-name="SearchView.render_lines">
|
||||||
<table border="0" cellspacing="0" cellpadding="0"
|
<table class="oe-searchview-render-line" border="0" cellspacing="0" cellpadding="0"
|
||||||
t-foreach="lines" t-as="line">
|
t-foreach="lines" t-as="line">
|
||||||
<tr>
|
<tr>
|
||||||
<td t-foreach="line" t-as="widget">
|
<td t-foreach="line" t-as="widget">
|
||||||
|
@ -484,7 +484,7 @@
|
||||||
<t t-name="SearchView.extended_search">
|
<t t-name="SearchView.extended_search">
|
||||||
<t t-call="SearchView.util.expand">
|
<t t-call="SearchView.util.expand">
|
||||||
<t t-set="expand" t-value="false"/>
|
<t t-set="expand" t-value="false"/>
|
||||||
<t t-set="label" t-value="'Extended Filters'"/>
|
<t t-set="label" t-value="'Custom Filters'"/>
|
||||||
<t t-set="content">
|
<t t-set="content">
|
||||||
<div class="searchview_extended_groups_list"/>
|
<div class="searchview_extended_groups_list"/>
|
||||||
<button class="searchview_extended_add_group"
|
<button class="searchview_extended_add_group"
|
||||||
|
@ -493,18 +493,17 @@
|
||||||
</t>
|
</t>
|
||||||
</t>
|
</t>
|
||||||
<t t-name="SearchView.extended_search.group">
|
<t t-name="SearchView.extended_search.group">
|
||||||
<div t-att-id="element_id">
|
<div t-att-id="element_id" class="searchview_extended_group">
|
||||||
<select class="searchview_extended_group_choice">
|
<select class="searchview_extended_group_choice">
|
||||||
<option value="all">All</option>
|
<option value="all">All the following conditions must match</option>
|
||||||
<option value="any">Any</option>
|
<option value="any">Any of the following conditions must match</option>
|
||||||
<option value="none">None</option>
|
<option value="none">None of the following conditions must match</option>
|
||||||
</select>
|
</select>
|
||||||
|
<button class="searchview_extended_delete_group"
|
||||||
|
type="button">Delete this group of conditions</button>
|
||||||
<div class="searchview_extended_propositions_list">
|
<div class="searchview_extended_propositions_list">
|
||||||
</div>
|
</div>
|
||||||
<button class="searchview_extended_add_proposition"
|
<button class="searchview_extended_add_proposition" type="button">Add condition</button>
|
||||||
type="button">Add condition</button>
|
|
||||||
<button class="searchview_extended_delete_group"
|
|
||||||
type="button">Delete this group</button>
|
|
||||||
</div>
|
</div>
|
||||||
</t>
|
</t>
|
||||||
<t t-name="SearchView.extended_search.proposition">
|
<t t-name="SearchView.extended_search.proposition">
|
||||||
|
|
Loading…
Reference in New Issue