[FIX] web: fix view manager header height form view

[odoo/odoo.git] / addons / web / static / src / xml / base.xml

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c57ac08..d37535c 100644 (file)
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -482,7 +482,7 @@
             <div class="oe-view-manager-search-view col-md-6" />
         </div>
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-6 oe-button-column">
                 <div class="oe-view-manager-buttons">
                     <t t-foreach="widget.views" t-as="view">
                         <div t-attf-class="oe-#{view}-buttons"/>
@@ -793,14 +793,14 @@
 </t>
 <div t-name="FormView.buttons">
     <t t-if="widget.options.action_buttons !== false">
-        <div class="btn-group btn-group-sm oe_form_buttons_view">
+        <div class="oe_form_buttons_view">
             <button t-if="widget.is_action_enabled('edit')" 
                     type="button" 
-                    class="oe_form_button_edit btn btn-default" accesskey="E">
+                    class="oe_form_button_edit btn btn-default btn-sm" accesskey="E">
                 Edit
             </button>
             <button t-if="widget.is_action_enabled('create')"
-                    type="button" class="oe_form_button_create btn btn-default"
+                    type="button" class="oe_form_button_create btn btn-default btn-sm"
                     accesskey="C">
                 Create
             </button>
@@ -1391,15 +1391,15 @@
             <t t-foreach="values" t-as="id">
                 <t t-set="file" t-value="widget.data[id]"/>
                 <div class="oe_attachment">
-                    <span t-if="(file.upload or file.percent_loaded&lt;100)" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-attf-name="{file.name || file.filename}">
+                    <span t-if="(file.upload or file.percent_loaded&lt;100)" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-attf-name="#{file.name || file.filename}">
                         <span class="oe_fileuploader_in_process">...Upload in progress...</span>
                         <t t-raw="file.name || file.filename"/>
                     </span>
-                    <a t-if="(!file.upload or file.percent_loaded&gt;=100)" t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
+                    <a t-if="(!file.upload or file.percent_loaded&gt;=100)" t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
                         <t t-raw="file.name || file.filename"/>
                     </a>
                     <t t-if="(!file.upload or file.percent_loaded&gt;=100)">
-                        <a class="oe_right oe_delete oe_e" title="Delete this file" t-attf-data-id="{file.id}">[</a>
+                        <a class="oe_right oe_delete oe_e" title="Delete this file" t-attf-data-id="#{file.id}">[</a>
                     </t>
                 </div>
             </t>
@@ -1408,7 +1408,7 @@
             <t t-foreach="widget.get('value')" t-as="id">
                 <t t-set="file" t-value="widget.data[id]"/>
                 <div>
-                    <a t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
+                    <a t-att-href="file.url" t-attf-title="#{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
                         <t t-raw="file.name || file.filename"/>
                     </a>
                 </div>
@@ -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">