diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-10-29 11:21:32 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-10-31 13:55:58 +0100 |
| commit | a3369a1f264c236c4ccb136ead8151d61b2e7cd0 (patch) | |
| tree | 11d4fe25490788dea5d396395714fe7d75c2bbf6 /addons/web | |
| parent | 661d8df757085effa950aa7e8763f83c527b7928 (diff) | |
[IMP] add a 'or' operator between custom filters (web)
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/css/base.css | 14 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 10 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 64ad17efe07..e5fb1a2b2f9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1440,6 +1440,20 @@ padding-right: 10px; margin-bottom: 5px; } +.openerp .oe-search-options .dropdown-menu li.oe-filter-condition .o-or-filter { + display: none; +} +.openerp .oe-search-options .dropdown-menu li.oe-filter-condition + li.oe-filter-condition { + margin-top: 10px; +} +.openerp .oe-search-options .dropdown-menu li.oe-filter-condition + li.oe-filter-condition .o-or-filter { + display: block; +} +.openerp .oe-search-options .dropdown-menu .o-or-filter { + position: absolute; + left: 5px; + top: 5px; +} .openerp .oe-search-options a { display: inline-block; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e04ed87d1c4..fcf05d19880 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1227,6 +1227,16 @@ $sheet-padding: 16px padding-left: 25px padding-right: 10px margin-bottom: 5px + .o-or-filter + display: none + li.oe-filter-condition + li.oe-filter-condition + margin-top: 10px + .o-or-filter + display: block + .o-or-filter + position: absolute + left: 5px + top: 5px a display: inline-block diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c57ac08b0df..4b4fcba4277 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1687,6 +1687,7 @@ </div> <t t-name="SearchView.extended_search.proposition"> <li class="oe-filter-condition"> + <span class="o-or-filter">or</span> <span> <select class="searchview_extended_prop_field form-control"> <t t-foreach="widget.attrs.fields" t-as="field"> |