diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-10-31 13:59:33 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-10-31 13:59:33 +0100 |
| commit | c4f3f06fbf73401834228cada3669e2003693971 (patch) | |
| tree | 2c62603bf8ec21cbe9e688546162937fe37ce201 /addons/web/static/src/xml/base.xml | |
| parent | 287f65744b6f0a45c7347fae5cbfc3cb155fd680 (diff) | |
| parent | 1f5a323f2f76713be26375c6fc36838a84458df4 (diff) | |
[FIX] various layout fixes for searchview related issues
include modal dialog fixes, css issues in searchview, missing
field description, ...
Merge branch 'master-searchview-fixes-ged'
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c57ac08b0df..a4e0bfe7386 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1480,21 +1480,13 @@ </t> <t t-name="AbstractFormPopup.render"> - <div class="container-fluid"> - <div class="row oe-modal-header"> - <div class="col-md-8 col-md-offset-4 oe_popup_search"> - </div> - </div> - <div class="row oe-modal-header"> - <div class="col-md-8 col-md-offset-4"> - <div class="oe-search-options btn-group"/> - <div class="oe_popup_list_pager"/> - </div> - </div> - <div class="row"> - <div class="oe_popup_list"/> + <div> + <div class="o-modal-header"> + <div class="o-popup-search"/> + <div class="o-search-options oe-search-options"/> </div> - <div class="row oe_popup_form"></div> + <div class="oe_popup_list"/> + <div class="oe_popup_form"/> </div> </t> <t t-name="SelectCreatePopup.search.buttons"> @@ -1687,6 +1679,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"> |