From 0a71d06be3909cfde8e3bd41752af2ba84dae023 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 12 Mar 2014 14:22:13 +0100
Subject: [IMP] work in progress on stats buttons. The goal is to allow buttons
 with dynamic/statistical informations in form views (addon web)

bzr revid: ged@openerp.com-20140312132213-hclaw6jc87u220zq
---
 addons/web/static/src/xml/base.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'addons/web/static/src/xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 80b82c1f40b..fa96fe1ac8a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1360,6 +1360,16 @@
         <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
 </t>
+<t t-name="StatButton">
+    <label type="button" class="oe_stat_button btn btn-default"
+        t-att-style="widget.node.attrs.style"
+        t-att-tabindex="widget.node.attrs.tabindex"
+        t-att-autofocus="widget.node.attrs.autofocus"
+        t-att-accesskey="widget.node.attrs.accesskey">
+        <t t-if="widget.icon"><div class="stat_button_icon"><t t-raw="widget.icon"/></div></t>
+        <span t-if="widget.string"><t t-esc="widget.string"/></span>
+    </label>
+</t>
 <t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
     <t t-jquery="div.oe_tooltip_string" t-operation="replace">
         <div class="oe_tooltip_string" t-if="debug || widget.string">
-- 
cgit v1.2.3


From d2637811dec84306ab80cc49f40a8b823d7984a6 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 13 Mar 2014 13:48:43 +0100
Subject: [IMP] adds PercentPie and X2Many widgets to formview.  PercentPie
 takes a field 'float' and displays a read-only pie chart to visualize the
 corresponding percent. X2Many takes a 1tomany or a manytomany field and
 display a read only string '<number of records> <label>'

bzr revid: ged@openerp.com-20140313124843-d4tc5zdz3lx2r8kt
---
 addons/web/static/src/xml/base.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'addons/web/static/src/xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fa96fe1ac8a..5dd94644ff9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1188,6 +1188,11 @@
         <span></span>
     </span>
 </t>
+<t t-name="FieldPercentPie">
+    <span id="prout" class="oe_form_field oe_form_field_percent_pie" t-att-style="widget.node.attrs.style">
+        <svg></svg>
+    </span>
+</t>
 <t t-name="FieldStatus">
     <ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_status_clickable' : 'oe_form_status')" t-att-style="widget.node.attrs.style"/>
 </t>
@@ -1940,4 +1945,7 @@
 <t t-name="X2ManyCounter">
     <a href="javascript:void(0)"><t t-esc="text"/></a>
 </t>
+<t t-name="X2Many">
+    <div><t t-esc="text"/></div>
+</t>
 </templates>
-- 
cgit v1.2.3


From d849c6521d21d02e630179a4764888cd105cbe62 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Fri, 14 Mar 2014 14:44:56 +0100
Subject: [IMP] removes the 'stat_button' widget and modifies button to fulfill
 that role.  Now, a button with a class 'oe_stat_button' will be displayed
 differently (look in form views) (addon web).  Also removes the useless
 widget x2many

bzr revid: ged@openerp.com-20140314134456-wy6ya3zz72zx3yo2
---
 addons/web/static/src/xml/base.xml | 40 ++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'addons/web/static/src/xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5dd94644ff9..b24bd8642cc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1356,24 +1356,26 @@
     </div>
 </t>
 <t t-name="WidgetButton">
-    <button type="button" class="oe_button oe_form_button"
-        t-att-style="widget.node.attrs.style"
-        t-att-tabindex="widget.node.attrs.tabindex"
-        t-att-autofocus="widget.node.attrs.autofocus"
-        t-att-accesskey="widget.node.attrs.accesskey">
-        <img t-if="widget.node.attrs.icon" t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/>
-        <span t-if="widget.string"><t t-esc="widget.string"/></span>
-    </button>
-</t>
-<t t-name="StatButton">
-    <label type="button" class="oe_stat_button btn btn-default"
-        t-att-style="widget.node.attrs.style"
-        t-att-tabindex="widget.node.attrs.tabindex"
-        t-att-autofocus="widget.node.attrs.autofocus"
-        t-att-accesskey="widget.node.attrs.accesskey">
-        <t t-if="widget.icon"><div class="stat_button_icon"><t t-raw="widget.icon"/></div></t>
-        <span t-if="widget.string"><t t-esc="widget.string"/></span>
-    </label>
+    <t t-if="!widget.is_stat_button">
+        <button type="button" class="oe_button oe_form_button"
+            t-att-style="widget.node.attrs.style"
+            t-att-tabindex="widget.node.attrs.tabindex"
+            t-att-autofocus="widget.node.attrs.autofocus"
+            t-att-accesskey="widget.node.attrs.accesskey">
+            <img t-if="widget.node.attrs.icon" t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/>
+            <span t-if="widget.string"><t t-esc="widget.string"/></span>
+        </button>
+    </t>
+    <t t-if="widget.is_stat_button">
+        <label type="button" class="oe_stat_button btn btn-default"
+            t-att-style="widget.node.attrs.style"
+            t-att-tabindex="widget.node.attrs.tabindex"
+            t-att-autofocus="widget.node.attrs.autofocus"
+            t-att-accesskey="widget.node.attrs.accesskey">
+            <t t-if="widget.icon"><div class="stat_button_icon"><t t-raw="widget.icon"/></div></t>
+            <span t-if="widget.string"><t t-esc="widget.string"/></span>
+        </label>
+    </t>
 </t>
 <t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
     <t t-jquery="div.oe_tooltip_string" t-operation="replace">
@@ -1945,7 +1947,7 @@
 <t t-name="X2ManyCounter">
     <a href="javascript:void(0)"><t t-esc="text"/></a>
 </t>
-<t t-name="X2Many">
+<t t-name="StatInfo">
     <div><t t-esc="text"/></div>
 </t>
 </templates>
-- 
cgit v1.2.3


From e8198d74b68c3f1fba677b596a2eedf60af8ad83 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 17 Mar 2014 16:27:10 +0100
Subject: [IMP] various tweaks to stat_button, to fix issues mentioned in code
 review.  This is mostly cosmetic cleanups, only notable change is that
 stat_button is now a proper html button instead of a label (addon web)

bzr revid: ged@openerp.com-20140317152710-c33q8kua33o001la
---
 addons/web/static/src/xml/base.xml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'addons/web/static/src/xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index b24bd8642cc..cc56dc2de13 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1189,7 +1189,7 @@
     </span>
 </t>
 <t t-name="FieldPercentPie">
-    <span id="prout" class="oe_form_field oe_form_field_percent_pie" t-att-style="widget.node.attrs.style">
+    <span class="oe_form_field oe_form_field_percent_pie" t-att-style="widget.node.attrs.style">
         <svg></svg>
     </span>
 </t>
@@ -1356,26 +1356,15 @@
     </div>
 </t>
 <t t-name="WidgetButton">
-    <t t-if="!widget.is_stat_button">
-        <button type="button" class="oe_button oe_form_button"
-            t-att-style="widget.node.attrs.style"
-            t-att-tabindex="widget.node.attrs.tabindex"
-            t-att-autofocus="widget.node.attrs.autofocus"
-            t-att-accesskey="widget.node.attrs.accesskey">
-            <img t-if="widget.node.attrs.icon" t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/>
-            <span t-if="widget.string"><t t-esc="widget.string"/></span>
-        </button>
-    </t>
-    <t t-if="widget.is_stat_button">
-        <label type="button" class="oe_stat_button btn btn-default"
-            t-att-style="widget.node.attrs.style"
-            t-att-tabindex="widget.node.attrs.tabindex"
-            t-att-autofocus="widget.node.attrs.autofocus"
-            t-att-accesskey="widget.node.attrs.accesskey">
-            <t t-if="widget.icon"><div class="stat_button_icon"><t t-raw="widget.icon"/></div></t>
-            <span t-if="widget.string"><t t-esc="widget.string"/></span>
-        </label>
-    </t>
+    <button type="button" t-att-class="widget.is_stat_button ? 'oe_stat_button btn btn-default' : 'oe_button oe_form_button'"
+        t-att-style="widget.node.attrs.style"
+        t-att-tabindex="widget.node.attrs.tabindex"
+        t-att-autofocus="widget.node.attrs.autofocus"
+        t-att-accesskey="widget.node.attrs.accesskey">
+        <img t-if="!widget.is_stat_button and widget.node.attrs.icon " t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/>
+        <t t-if="widget.is_stat_button and widget.icon"><div class="stat_button_icon"><t t-raw="widget.icon"/></div></t>
+        <span t-if="widget.string"><t t-esc="widget.string"/></span>
+    </button>
 </t>
 <t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
     <t t-jquery="div.oe_tooltip_string" t-operation="replace">
-- 
cgit v1.2.3


From 373cb908caf5792367e49050e3d4ae086a097d0c Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 18 Mar 2014 09:55:25 +0100
Subject: [FIX] correctly handle the case where a 'stat button' has a string
 attribute (it needs to be displayed in a div instead of a span) (addon web)

bzr revid: ged@openerp.com-20140318085525-vllzeycht9841g41
---
 addons/web/static/src/xml/base.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/web/static/src/xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index cc56dc2de13..508c507d935 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1362,11 +1362,11 @@
         t-att-autofocus="widget.node.attrs.autofocus"
         t-att-accesskey="widget.node.attrs.accesskey">
         <img t-if="!widget.is_stat_button and widget.node.attrs.icon " t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/>
-        <t t-if="widget.is_stat_button and widget.icon"><div class="stat_button_icon"><t t-raw="widget.icon"/></div></t>
-        <span t-if="widget.string"><t t-esc="widget.string"/></span>
+        <div t-if="widget.is_stat_button and widget.icon" class="stat_button_icon"><t t-raw="widget.icon"/></div>
+        <span t-if="widget.string and !widget.is_stat_button"><t t-esc="widget.string"/></span>
+        <div t-if="widget.string and widget.is_stat_button"><t t-esc="widget.string"/></div>
     </button>
-</t>
-<t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
+</t><t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
     <t t-jquery="div.oe_tooltip_string" t-operation="replace">
         <div class="oe_tooltip_string" t-if="debug || widget.string">
             <t t-if="debug">
-- 
cgit v1.2.3


From f4cfed3f0e89f8841b16ad578dd2c360f01d18ec Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 19 Mar 2014 09:57:18 +0100
Subject: [IMP] improves the look of the stat buttons in form view: the
 statinfo widget displays the information on two lines, the
 padding/margin/width have been adjusted. (addon web)

bzr revid: ged@openerp.com-20140319085718-9v1l3pb43ee6qws6
---
 addons/web/static/src/xml/base.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 508c507d935..e35d0c977b3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1362,7 +1362,7 @@
         t-att-autofocus="widget.node.attrs.autofocus"
         t-att-accesskey="widget.node.attrs.accesskey">
         <img t-if="!widget.is_stat_button and widget.node.attrs.icon " t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/>
-        <div t-if="widget.is_stat_button and widget.icon" class="stat_button_icon"><t t-raw="widget.icon"/></div>
+        <div t-if="widget.is_stat_button" class="stat_button_icon"><t t-if="widget.icon" t-raw="widget.icon"/></div>
         <span t-if="widget.string and !widget.is_stat_button"><t t-esc="widget.string"/></span>
         <div t-if="widget.string and widget.is_stat_button"><t t-esc="widget.string"/></div>
     </button>
@@ -1937,6 +1937,5 @@
     <a href="javascript:void(0)"><t t-esc="text"/></a>
 </t>
 <t t-name="StatInfo">
-    <div><t t-esc="text"/></div>
-</t>
+    <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t>
 </templates>
-- 
cgit v1.2.3


From 4afeee59d10485b84740faf4182678a733f24b03 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 2 Apr 2014 10:37:17 +0200
Subject: [FIX] fixes an alignment issue in the template definitions (addon
 web)

bzr revid: ged@openerp.com-20140402083717-y3p22u2e47d60bbt
---
 addons/web/static/src/xml/base.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 1a5721d28f8..23cad2098dc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1373,7 +1373,8 @@
         <span t-if="widget.string and !widget.is_stat_button"><t t-esc="widget.string"/></span>
         <div t-if="widget.string and widget.is_stat_button"><t t-esc="widget.string"/></div>
     </button>
-</t><t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
+</t>
+<t t-name="WidgetButton.tooltip" t-extend="WidgetLabel.tooltip">
     <t t-jquery="div.oe_tooltip_string" t-operation="replace">
         <div class="oe_tooltip_string" t-if="debug || widget.string">
             <t t-if="debug">
-- 
cgit v1.2.3