From f64c1c6b7457ca73ac01b6dd3cebdbaa2889baa1 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 5 Jan 2017 13:13:09 +0100
Subject: [IMP] web: FieldDomain panel at top right instead of below

The FieldDomain is composed of a DomainSelector widget and a button
which allows to see the records which match the domain (or an error
message if the domain is wrong).
The button was placed below the domain selector. Now, in edit mode,
it is placed at the top-right of the domain selector, saving some
vertical space.
---
 addons/web/static/src/xml/base.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to '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 dc3119908fe..34387d9f507 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -669,12 +669,13 @@
         t-att-maxlength="widget.field.size"/>
 </t>
 
-<div t-name="FieldDomain" class="o_form_field_domain">
+<div t-name="FieldDomain" t-attf-class="o_form_field_domain#{widget.get('effective_readonly') ? '' : ' o_edit_mode'}">
     <!-- domain selector will be instantiated here -->
-    <div class="mt8">
+    <div class="o_form_field_domain_panel">
         <i class="fa fa-arrow-right"/>
-        <span><span class="o_domain_records_count"/> Records Selected</span>
-        <button class="btn btn-default btn-xs o_domain_show_selection_button" type="button">See selection</button>
+        <button class="btn btn-xs btn-default o_domain_show_selection_button" type="button">
+            <span class="o_domain_records_count"/> record(s)
+        </button>
         <span class="text-warning o_domain_error_message hidden"><i class="fa fa-exclamation-triangle"/> Invalid domain</span>
     </div>
 </div>
@@ -683,7 +684,7 @@
     <div t-if="!widget.readonly &amp;&amp; !widget.noControlPanel" class="btn-group btn-group-sm pull-right o_domain_node_control_panel">
         <button class="btn btn-default o_domain_delete_node_button"><i class="fa fa-minus"/></button>
         <button class="btn btn-default o_domain_add_node_button"><i class="fa fa-plus"/></button>
-        <button class="btn btn-default o_domain_add_node_button" t-att-data-branch="1"><i class="fa fa-ellipsis-h"/></button>
+        <button class="btn btn-default o_domain_add_node_button" data-branch="1"><i class="fa fa-ellipsis-h"/></button>
     </div>
 </t>
 <t t-name="DomainTree.OperatorSelector">
@@ -711,9 +712,9 @@
     </t>
     <t t-else="">
         <div>
-            <t t-if="widget.children.length === 1">Match the records with the following rule:</t>
+            <t t-if="widget.children.length === 1">Match records with the following rule:</t>
             <t t-else="">
-                <span>Match the records with</span>
+                <span>Match records with</span>
                 <t t-call="DomainTree.OperatorSelector"/>
                 <span>of the following rules:</span>
             </t>
-- 
cgit v1.2.3


From 11a4e17c9c129d103d551661ec2b06efeda21bc4 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 5 Jan 2017 14:01:48 +0100
Subject: [IMP] web: add a dialog option to the FieldDomain

Now, the form FieldDomain has an option "dialog" which allows to force
the domain *edition* in a new dialog. This allows the field to be
positioned in smaller area of the form view in some contexts.
---
 addons/web/static/src/xml/base.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '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 34387d9f507..47254cebb09 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -669,7 +669,7 @@
         t-att-maxlength="widget.field.size"/>
 </t>
 
-<div t-name="FieldDomain" t-attf-class="o_form_field_domain#{widget.get('effective_readonly') ? '' : ' o_edit_mode'}">
+<div t-name="FieldDomain" t-attf-class="o_form_field_domain#{widget.get('effective_readonly') ? '' : ' o_edit_mode'}#{widget.options.in_dialog ? '' : ' o_inline_mode'}">
     <!-- domain selector will be instantiated here -->
     <div class="o_form_field_domain_panel">
         <i class="fa fa-arrow-right"/>
@@ -677,6 +677,8 @@
             <span class="o_domain_records_count"/> record(s)
         </button>
         <span class="text-warning o_domain_error_message hidden"><i class="fa fa-exclamation-triangle"/> Invalid domain</span>
+        <button t-if="widget.options.in_dialog &amp;&amp; !widget.get('effective_readonly')"
+            class="btn btn-sm btn-primary o_form_field_domain_dialog_button">Edit domain</button>
     </div>
 </div>
 
-- 
cgit v1.2.3