From b987405134e09aeacabbeeeb3edbdf3fe64ce065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Mar 2014 10:29:55 +0100
Subject: [PATCH 01/10] [IMP] Sidebar: added a new section for the sidebar, the
 buttons section. When having actions to display in the 'more' menu and if the
 action id is present in the context, get the action out of the menu to
 display a specific red button. This is used to highlight some specific action
 to do in a given flow. For example when going to a list view from a button,
 with an action that should be the next one to perform, it allows to display
 the button once at least one record is selected.

bzr revid: tde@openerp.com-20140318092955-vym3d7xkl3mmf62i
---
 addons/web/static/src/js/views.js  | 43 +++++++++++++++++++-----------
 addons/web/static/src/xml/base.xml |  8 +++++-
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index c9229c3c70a..829a6251404 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1117,10 +1117,12 @@ instance.web.Sidebar = instance.web.Widget.extend({
         this._super(parent);
         var view = this.getParent();
         this.sections = [
+            { 'name': 'buttons', 'label': _t('Button'), },
             { 'name' : 'print', 'label' : _t('Print'), },
             { 'name' : 'other', 'label' : _t('More'), }
         ];
         this.items = {
+            'buttons': [],
             'print' : [],
             'other' : []
         };
@@ -1132,22 +1134,24 @@ instance.web.Sidebar = instance.web.Widget.extend({
         });
     },
     start: function() {
-        var self = this;
         this._super(this);
         this.redraw();
-        this.$el.on('click','.oe_dropdown_menu li a', function(event) {
-            var section = $(this).data('section');
-            var index = $(this).data('index');
-            var item = self.items[section][index];
-            if (item.callback) {
-                item.callback.apply(self, [item]);
-            } else if (item.action) {
-                self.on_item_action_clicked(item);
-            } else if (item.url) {
-                return true;
-            }
-            event.preventDefault();
-        });
+        this.$el.on('click', 'button.oe_sidebar_button', this.on_item_click);
+        this.$el.on('click','.oe_dropdown_menu li a', this.on_item_click);
+    },
+    on_item_click: function (event) {
+        var self = this;
+        var section = $(event.currentTarget).data('section');
+        var index = $(event.currentTarget).data('index');
+        var item = self.items[section][index];
+        if (item.callback) {
+            item.callback.apply(self, [item]);
+        } else if (item.action) {
+            self.on_item_action_clicked(item);
+        } else if (item.url) {
+            return true;
+        }
+        event.preventDefault();
     },
     redraw: function() {
         var self = this;
@@ -1197,17 +1201,26 @@ instance.web.Sidebar = instance.web.Widget.extend({
     },
     add_toolbar: function(toolbar) {
         var self = this;
+        var context = self.getParent().dataset.context; // not sure this is the correct way to find the context
+        var highlighted_act_ids = context['view_manager_highlight'] || [];
         _.each(['print','action','relate'], function(type) {
             var items = toolbar[type];
             if (items) {
                 for (var i = 0; i < items.length; i++) {
+                    var section_code = 'other';
+                    if (highlighted_act_ids && _.indexOf(highlighted_act_ids, items[i]['id']) != -1) {
+                        section_code = 'buttons';
+                    }
+                    else if (type == 'print') {
+                        section_code = 'print';
+                    }
                     items[i] = {
                         label: items[i]['name'],
                         action: items[i],
                         classname: 'oe_sidebar_' + type
                     };
+                    self.add_items(section_code, [items[i]]);
                 }
-                self.add_items(type=='print' ? 'print' : 'other', items);
             }
         });
     },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 7ba06b69095..6f1c98cdda2 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -599,10 +599,16 @@
     <div class="oe_sidebar">
         <t t-foreach="widget.sections" t-as="section">
             <div class="oe_form_dropdown_section">
-                <button class="oe_dropdown_toggle oe_dropdown_arrow">
+                <button class="oe_dropdown_toggle oe_dropdown_arrow" t-if="section.name != 'buttons'">
                     <t t-if="section.name == 'files'" t-raw="widget.items[section.name].length || ''"/>
                     <t t-esc="section.label"/>
                 </button>
+                <t t-if="section.name == 'buttons'" t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
+                    <button t-att-title="item.title or ''" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url"
+                        target="_blank" class="oe_sidebar_button oe_highlight">
+                        <t t-raw="item.label"/>
+                    </button>
+                </t>
                 <ul class="oe_dropdown_menu">
                     <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
                         <t t-if="section.name == 'files'">

From 1a086bca821df7fa95fb00d6a6474061cd444926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Mar 2014 11:25:01 +0100
Subject: [PATCH 02/10] [IMP] sidebar in list view: context should be the one
 of the dataset, allowing context propagation, not void default context.

bzr revid: tde@openerp.com-20140318102501-pi6qcaz1zbu71tsh
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 829a6251404..e24de77ea4f 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1531,7 +1531,7 @@ instance.web.View = instance.web.Widget.extend({
         new instance.web.DataExport(this, this.dataset).open();
     },
     sidebar_eval_context: function () {
-        return $.when({});
+        return $.when(new instance.web.CompoundContext(this.dataset.get_context()));
     },
     /**
      * Asks the view to reload itself, if the reloading is asynchronous should

From 2f0b59be37c2878aa3efcaa075a972eb80300469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 20 Mar 2014 18:39:07 +0100
Subject: [PATCH 03/10] [IMP] list_view: allow displaying string-based buttons
 in list view and not only img-based buttons.

bzr revid: tde@openerp.com-20140320173907-5b02atnispbznqmj
---
 addons/web/static/src/css/base.css    |  2 +-
 addons/web/static/src/css/base.sass   |  2 +-
 addons/web/static/src/js/view_list.js |  4 ++--
 addons/web/static/src/xml/base.xml    | 12 +++++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6a20442ed41..3996579e02a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2877,7 +2877,7 @@
   padding: 3px 6px;
   white-space: pre-line;
 }
-.openerp .oe_list_content > tbody > tr > td > button, .openerp .oe_list_content > tbody > tr > th > button {
+.openerp .oe_list_content > tbody > tr > td > button.btn_img, .openerp .oe_list_content > tbody > tr > th > button.btn_img {
   border: none;
   background: transparent;
   padding: 0;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 38a47eed1c5..b08427e0832 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2312,7 +2312,7 @@ $sheet-padding: 16px
                     padding: 3px 6px
                     white-space: pre-line
                 > td, > th
-                    > button
+                    > button.btn_img
                         border: none
                         background: transparent
                         padding: 0
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 7426c70838c..d9a44fb991d 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -2260,8 +2260,8 @@ instance.web.list.Button = instance.web.list.Column.extend({
             attrs = this.modifiers_for(row_data);
         }
         if (attrs.invisible) { return ''; }
-
-        return QWeb.render('ListView.row.button', {
+        var template = this.icon && 'ListView.row.button' || 'ListView.row.text_button';
+        return QWeb.render(template, {
             widget: this,
             prefix: instance.session.prefix,
             disabled: attrs.readonly
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 6f1c98cdda2..ded573f2af3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -785,11 +785,17 @@
         </span>
     </t>
 </t>
+<button t-name="ListView.row.text_button" type="button"
+        t-att-title="widget.string" t-att-disabled="disabled || undefined"
+        t-att-class="disabled ? 'oe_list_button_disabled btn' : 'btn'">
+    <t t-esc="widget.string"/>
+</button>
 <button t-name="ListView.row.button" type="button"
         t-att-title="widget.string" t-att-disabled="disabled || undefined"
-        t-att-class="disabled ? 'oe_list_button_disabled' : undefined"
-    ><img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png"
-         t-att-alt="widget.string"/></button>
+        t-att-class="disabled ? 'oe_list_button_disabled btn_img' : 'btn_img'">
+    <img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png"
+        t-att-alt="widget.string"/>
+</button>
 <t t-extend="ListView.row">
     <!-- adds back padding to row being rendered after edition, if necessary
          (if not deletable add back padding), otherwise the row being added is

From 423f81bf5cf4dd9e949fcabbd2babe4fe3187676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Mar 2014 11:38:09 +0100
Subject: [PATCH 04/10] [IMP] view_form: Many2One: when choosing not to have
 the possibility of creating values in a many2one, also avoid displaying an
 'error displayer' that allow to create a new record.

bzr revid: tde@openerp.com-20140327103809-nmvc4102y4kp8v1r
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3dc148bc7c1..aefee14fcb5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3360,7 +3360,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 }
                 self.floating = false;
             }
-            if (used && self.get("value") === false && ! self.no_ed) {
+            if (used && self.get("value") === false && ! self.no_ed && (self.options.no_create === false || self.options.no_create === undefined)) {
                 self.ed_def.reject();
                 self.uned_def.reject();
                 self.ed_def = $.Deferred();

From a43998c41f05f58f6fc053fa6824b527debb2068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 8 Apr 2014 13:31:07 +0200
Subject: [PATCH 05/10] [IMP] web: stat buttons: some CSS fixes + added
 barchart button that display a barchart. Whoo.

bzr revid: tde@openerp.com-20140408113107-y9zstny6a0ybi38l
---
 addons/web/static/src/css/base.css    | 10 +++++-
 addons/web/static/src/css/base.sass   |  6 ++++
 addons/web/static/src/js/view_form.js | 52 +++++++++++++++++++++++----
 addons/web/static/src/xml/base.xml    | 16 ++++++---
 4 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5469c5376b0..a0f69ff1514 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -494,9 +494,17 @@
   width: 37px;
   text-align: center;
 }
+.openerp .oe_button_box .oe_stat_button .oe_form_field_percent_pie {
+  width: 42px;
+}
+.openerp .oe_button_box .oe_stat_button .oe_form_field_bar_chart {
+  width: 42px;
+}
 .openerp .oe_button_box .oe_stat_button svg {
   width: 38px;
   height: 38px;
+  display: inline;
+  vertical-align: middle;
 }
 .openerp .oe_avatar > img {
   max-height: 90px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 65f22a89481..c8121749194 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -461,9 +461,15 @@ $sheet-padding: 16px
                 padding: 0px 3px
                 width: 37px
                 text-align: center
+            .oe_form_field_percent_pie
+                width: 42px
+            .oe_form_field_bar_chart
+                width: 42px
             svg
                 width: 38px
                 height: 38px
+                display: inline
+                vertical-align: middle
     .oe_avatar
         > img
             max-height: 90px
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 27d5a524ad8..c54225a9953 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2834,10 +2834,10 @@ instance.web.form.FieldPercentPie = instance.web.form.AbstractField.extend({
 
         svg.innerHTML = "";
         nv.addGraph(function() {
-            var size=43;
+            var width = 42, height = 42;
             var chart = nv.models.pieChart()
-                .width(size)
-                .height(size)
+                .width(width)
+                .height(height)
                 .margin({top: 0, right: 0, bottom: 0, left: 0})
                 .donut(true) 
                 .showLegend(false)
@@ -2850,11 +2850,11 @@ instance.web.form.FieldPercentPie = instance.web.form.AbstractField.extend({
                 .datum([{'x': 'value', 'y': value}, {'x': 'complement', 'y': 100 - value}])
                 .transition()
                 .call(chart)
-                .attr({width:size, height:size});
+                .attr('style', 'width: ' + width + 'px; height:' + height + 'px;');
 
             d3.select(svg)
                 .append("text")
-                .attr({x: size/2, y: size/2 + 3, 'text-anchor': 'middle'})
+                .attr({x: width/2, y: height/2 + 3, 'text-anchor': 'middle'})
                 .style({"font-size": "10px", "font-weight": "bold"})
                 .text(formatted_value);
 
@@ -2864,6 +2864,43 @@ instance.web.form.FieldPercentPie = instance.web.form.AbstractField.extend({
     }
 });
 
+/**
+    The FieldBarChart expectsa list of values (indeed)
+*/
+instance.web.form.FieldBarChart = instance.web.form.AbstractField.extend({
+    template: 'FieldBarChart',
+
+    render_value: function() {
+        var value = this.get('value');
+        var svg = this.$('svg')[0];
+        svg.innerHTML = "";
+        nv.addGraph(function() {
+            var width = 34, height = 34;
+            var chart = nv.models.discreteBarChart()
+                .x(function (d) { return d.tooltip })
+                .y(function (d) { return d.value })
+                .width(width)
+                .height(height)
+                .margin({top: 0, right: 0, bottom: 0, left: 0})
+                .tooltips(false)
+                .showValues(false)
+                .transitionDuration(350)
+                .showXAxis(false)
+                .showYAxis(false);
+   
+            d3.select(svg)
+                .datum([{key: 'values', values: value}])
+                .transition()
+                .call(chart)
+                .attr('style', 'width: ' + (width + 4) + 'px; height: ' + (height + 8) + 'px;');
+
+            nv.utils.windowResize(chart.update);
+
+            return chart;
+        });
+   
+    }
+});
 
 
 instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
@@ -5924,8 +5961,10 @@ instance.web.form.StatInfo = instance.web.form.AbstractField.extend({
     render_value: function() {
         var options = {
             value: this.get("value") || 0,
-            text: this.string,
         };
+        if (! this.node.attrs.nolabel) {
+            options.text = this.string
+        }
         this.$el.html(QWeb.render("StatInfo", options));
     },
 
@@ -5959,6 +5998,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'boolean' : 'instance.web.form.FieldBoolean',
     'float' : 'instance.web.form.FieldFloat',
     'percentpie': 'instance.web.form.FieldPercentPie',
+    'barchart': 'instance.web.form.FieldBarChart',
     'integer': 'instance.web.form.FieldFloat',
     'float_time': 'instance.web.form.FieldFloat',
     'progressbar': 'instance.web.form.FieldProgressBar',
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 1aa9dec8880..06d5ed58552 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1208,9 +1208,16 @@
     </span>
 </t>
 <t t-name="FieldPercentPie">
-    <span class="oe_form_field oe_form_field_percent_pie" t-att-style="widget.node.attrs.style">
+    <div class="oe_form_field oe_form_field_percent_pie" t-att-style="widget.node.attrs.style">
         <svg></svg>
-    </span>
+        <span t-if="widget.string"><t t-esc="widget.string"/></span>
+    </div>
+</t>
+<t t-name="FieldBarChart">
+    <div class="oe_form_field oe_form_field_bar_chart" t-att-style="widget.node.attrs.style">
+        <svg></svg>
+        <span t-if="widget.string"><t t-esc="widget.string"/></span>
+    </div>
 </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"/>
@@ -1380,7 +1387,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" class="stat_button_icon"><t t-if="widget.icon" t-raw="widget.icon"/></div>
+        <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>
@@ -1956,5 +1963,6 @@
     <a href="javascript:void(0)"><t t-esc="text"/></a>
 </t>
 <t t-name="StatInfo">
-    <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t>
+    <strong><t t-esc="value"/></strong>
+    <t t-esc="text"/></t>
 </templates>

From ab12151b58748b6b87972bf1129dd4ab4ed493a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 8 Apr 2014 14:39:22 +0200
Subject: [PATCH 06/10] [FIX] web: fixed fieldbarchart, now accepting JSON;
 fixed statinfo, now properly managing values

bzr revid: tde@openerp.com-20140408123922-tqg2t3it3sm2dw44
---
 addons/web/static/src/js/view_form.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c54225a9953..99670ef259a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2871,7 +2871,7 @@ instance.web.form.FieldBarChart = instance.web.form.AbstractField.extend({
     template: 'FieldBarChart',
 
     render_value: function() {
-        var value = this.get('value');
+        var value = JSON.parse(this.get('value'));
         var svg = this.$('svg')[0];
         svg.innerHTML = "";
         nv.addGraph(function() {
@@ -5954,9 +5954,16 @@ instance.web.form.X2ManyCounter = instance.web.form.AbstractField.extend(instanc
     display a simple string "<value of field> <label of the field>"
 */
 instance.web.form.StatInfo = instance.web.form.AbstractField.extend({
+    is_field_number: true,
     init: function() {
         this._super.apply(this, arguments);
-        this.set("value", 0);
+        this.internal_set_value(0);
+    },
+    set_value: function(value_) {
+        if (value_ === false || value_ === undefined) {
+            value_ = 0;
+        }
+        this._super.apply(this, [value_]);
     },
     render_value: function() {
         var options = {
@@ -5970,6 +5977,7 @@ instance.web.form.StatInfo = instance.web.form.AbstractField.extend({
 
 });
 
+
 /**
  * Registry of form fields, called by :js:`instance.web.FormView`.
  *

From 33ebae745d08263ef12da8f192509549c2abecd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 15:25:28 +0200
Subject: [PATCH 07/10] [REV] Reverted changes about sidebar as we now have a
 widget to handle things like selection in a list view.

bzr revid: tde@openerp.com-20140415132528-0spzmcb2xmphxpwn
---
 addons/web/static/src/js/views.js | 45 +++++++++++--------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 62b5d693617..dc9f706d40e 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1117,12 +1117,10 @@ instance.web.Sidebar = instance.web.Widget.extend({
         this._super(parent);
         var view = this.getParent();
         this.sections = [
-            { 'name': 'buttons', 'label': _t('Button'), },
             { 'name' : 'print', 'label' : _t('Print'), },
             { 'name' : 'other', 'label' : _t('More'), }
         ];
         this.items = {
-            'buttons': [],
             'print' : [],
             'other' : []
         };
@@ -1134,24 +1132,22 @@ instance.web.Sidebar = instance.web.Widget.extend({
         });
     },
     start: function() {
+        var self = this;
         this._super(this);
         this.redraw();
-        this.$el.on('click', 'button.oe_sidebar_button', this.on_item_click);
-        this.$el.on('click','.oe_dropdown_menu li a', this.on_item_click);
-    },
-    on_item_click: function (event) {
-        var self = this;
-        var section = $(event.currentTarget).data('section');
-        var index = $(event.currentTarget).data('index');
-        var item = self.items[section][index];
-        if (item.callback) {
-            item.callback.apply(self, [item]);
-        } else if (item.action) {
-            self.on_item_action_clicked(item);
-        } else if (item.url) {
-            return true;
-        }
-        event.preventDefault();
+        this.$el.on('click','.oe_dropdown_menu li a', function(event) {
+            var section = $(this).data('section');
+            var index = $(this).data('index');
+            var item = self.items[section][index];
+            if (item.callback) {
+                item.callback.apply(self, [item]);
+            } else if (item.action) {
+                self.on_item_action_clicked(item);
+            } else if (item.url) {
+                return true;
+            }
+            event.preventDefault();
+        });
     },
     redraw: function() {
         var self = this;
@@ -1201,26 +1197,17 @@ instance.web.Sidebar = instance.web.Widget.extend({
     },
     add_toolbar: function(toolbar) {
         var self = this;
-        var context = self.getParent().dataset.context; // not sure this is the correct way to find the context
-        var highlighted_act_ids = context['view_manager_highlight'] || [];
         _.each(['print','action','relate'], function(type) {
             var items = toolbar[type];
             if (items) {
                 for (var i = 0; i < items.length; i++) {
-                    var section_code = 'other';
-                    if (highlighted_act_ids && _.indexOf(highlighted_act_ids, items[i]['id']) != -1) {
-                        section_code = 'buttons';
-                    }
-                    else if (type == 'print') {
-                        section_code = 'print';
-                    }
                     items[i] = {
                         label: items[i]['name'],
                         action: items[i],
                         classname: 'oe_sidebar_' + type
                     };
-                    self.add_items(section_code, [items[i]]);
                 }
+                self.add_items(type=='print' ? 'print' : 'other', items);
             }
         });
     },
@@ -1531,7 +1518,7 @@ instance.web.View = instance.web.Widget.extend({
         new instance.web.DataExport(this, this.dataset).open();
     },
     sidebar_eval_context: function () {
-        return $.when(new instance.web.CompoundContext(this.dataset.get_context()));
+        return $.when({});
     },
     /**
      * Asks the view to reload itself, if the reloading is asynchronous should

From c25b816a3b7686fada5de64f6cbfe60cd7f37cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 15:26:55 +0200
Subject: [PATCH 08/10] [FIX] web: fixed iamge buttons taking 2 lines

bzr revid: tde@openerp.com-20140415132655-029ulw9jgeut4bce
---
 addons/web/static/src/xml/base.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 3dcc00c9d7e..93904edb0b2 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -805,10 +805,9 @@
 </button>
 <button t-name="ListView.row.button" type="button"
         t-att-title="widget.string" t-att-disabled="disabled || undefined"
-        t-att-class="disabled ? 'oe_list_button_disabled btn_img' : 'btn_img'">
-    <img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png"
-        t-att-alt="widget.string"/>
-</button>
+        t-att-class="disabled ? 'oe_list_button_disabled btn_img' : 'btn_img'"
+        ><img t-attf-src="#{prefix}/web/static/src/img/icons/#{widget.icon}.png"
+        t-att-alt="widget.string"/></button>
 <t t-extend="ListView.row">
     <!-- adds back padding to row being rendered after edition, if necessary
          (if not deletable add back padding), otherwise the row being added is

From 02d07ac47eeb78a8848dad97bf4f09687f94994a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 15:39:14 +0200
Subject: [PATCH 09/10] [ADD] web: form: added char domain widget coming from
 mass_mailing. This widget is used to compute the number of records according
 ot a domain, and to allow selecting documents.

bzr revid: tde@openerp.com-20140415133914-v8fm6wn7up9ds85i
---
 addons/web/static/src/js/view_form.js | 71 +++++++++++++++++++++++++++
 addons/web/static/src/xml/base.xml    | 10 ++++
 2 files changed, 81 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2a54ee85d52..5b98d6adf19 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2435,6 +2435,76 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
     }
 });
 
+instance.web.form.FieldCharDomain = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
+    init: function(field_manager, node) {
+        this._super.apply(this, arguments);
+    },
+    start: function() {
+        var self=this;
+        this._super.apply(this, arguments);
+        this.on("change:effective_readonly", this, function () {
+            this.display_field();
+            this.render_value();
+        });
+        this.$('button.select_records').on('click', self.on_click);
+        this.display_field();
+        return this._super();
+    },
+    render_value: function() {
+        this.$('button.select_records').css('visibility', this.get('effective_readonly') ? 'hidden': '');
+    },
+    set_value: function(value_) {
+        var self = this;
+        this.set('value', value_ || false);
+        this.display_field();
+     },
+    display_field: function() {
+        var self = this;
+        this.$el.html(instance.web.qweb.render("FieldCharDomain", {widget: this}));
+        if (this.get('value')) {
+            var domain = instance.web.pyeval.eval('domain', this.get('value'));
+            var relation = this.getParent().fields.mailing_model.get('value')[0];
+            var ds = new instance.web.DataSetStatic(self, relation, self.build_context());
+            ds.call('search_count', [domain]).then(function (results) {
+                $('.oe_domain_count', self.$el).text(results + ' records selected');
+                $('button span', self.$el).text(' Change selection');
+            });
+        } else {
+            $('.oe_domain_count', this.$el).text('0 record selected');
+            $('button span', this.$el).text(' Select records');
+        };
+    },
+    on_click: function(ev) {
+        var self = this;
+        var model = this.options.model || this.field_manager.get_field_value(this.options.model_field);
+        this.pop = new instance.web.form.SelectCreatePopup(this);
+        this.pop.select_element(
+            model, {title: 'Select records...'},
+            [], this.build_context());
+        this.pop.on("elements_selected", self, function(element_ids) {
+            if (this.pop.$('input.oe_list_record_selector').prop('checked')) {
+                var search_data = this.pop.searchview.build_search_data();
+                var domain_done = instance.web.pyeval.eval_domains_and_contexts({
+                    domains: search_data.domains,
+                    contexts: search_data.contexts,
+                    group_by_seq: search_data.groupbys || []
+                }).then(function (results) {
+                    return results.domain;
+                });
+            }
+            else {
+                var domain = ["id", "in", element_ids];
+                var domain_done = $.Deferred().resolve(domain);
+            }
+            $.when(domain_done).then(function (domain) {
+                var domain = self.pop.dataset.domain.concat(domain || []);
+                self.set_value(JSON.stringify(domain))
+            });
+        });
+        event.preventDefault();
+    },
+});
+
 instance.web.DateTimeWidget = instance.web.Widget.extend({
     template: "web.datepicker",
     jqueryui_object: 'datetimepicker',
@@ -5990,6 +6060,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'url' : 'instance.web.form.FieldUrl',
     'text' : 'instance.web.form.FieldText',
     'html' : 'instance.web.form.FieldTextHtml',
+    'char_domain': 'instance.web.form.FieldCharDomain',
     'date' : 'instance.web.form.FieldDate',
     'datetime' : 'instance.web.form.FieldDatetime',
     'selection' : 'instance.web.form.FieldSelection',
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 93904edb0b2..a08de0bc4bd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1080,6 +1080,16 @@
         </t>
     </div>
 </t>
+<t t-name="FieldCharDomain">
+    <div class="oe_form_field">
+        <span class="oe_domain_count"/>
+        <button class="oe_button oe_link select_records" type="button"
+            t-att-style="widget.node.attrs.style"
+            t-att-accesskey="widget.node.attrs.accesskey">
+            <span class="fa fa-arrow-right"/>
+        </button>
+    </div>
+</t>
 <t t-name="web.datepicker">
     <span>
         <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>

From f39fb269a443c838281f6c5d1a0e5cfbe5eee7bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 15:51:45 +0200
Subject: [PATCH 10/10] [FIX] chardomain field: fixed button action

bzr revid: tde@openerp.com-20140415135145-1wks35wufs9b1etq
---
 addons/web/static/src/js/view_form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5b98d6adf19..4758e48f790 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2440,13 +2440,12 @@ instance.web.form.FieldCharDomain = instance.web.form.AbstractField.extend(insta
         this._super.apply(this, arguments);
     },
     start: function() {
-        var self=this;
+        var self = this;
         this._super.apply(this, arguments);
         this.on("change:effective_readonly", this, function () {
             this.display_field();
             this.render_value();
         });
-        this.$('button.select_records').on('click', self.on_click);
         this.display_field();
         return this._super();
     },
@@ -2473,6 +2472,7 @@ instance.web.form.FieldCharDomain = instance.web.form.AbstractField.extend(insta
             $('.oe_domain_count', this.$el).text('0 record selected');
             $('button span', this.$el).text(' Select records');
         };
+        this.$('.select_records').on('click', self.on_click);
     },
     on_click: function(ev) {
         var self = this;