From 062e96cc07a1e1ebe76e3bc3de0f788c448bae09 Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Tue, 3 Dec 2013 15:43:17 +0530
Subject: [IMP]Add bootstrap tooltip.

bzr revid: bth@tinyerp.com-20131203101317-bznca04cdosg0x3z
---
 addons/web/static/src/js/chrome.js    |  7 ++++---
 addons/web/static/src/js/view_form.js | 18 ++++++++++--------
 addons/web/static/src/js/views.js     |  4 ++--
 3 files changed, 16 insertions(+), 13 deletions(-)

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

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index abbd4767361..c58089f4b5c 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1261,8 +1261,8 @@ instance.web.Client = instance.web.Widget.extend({
     },
     bind_events: function() {
         var self = this;
-        this.$el.on('mouseenter', '.oe_systray > div:not([data-tipsy=true])', function() {
-            $(this).attr('data-tipsy', 'true').tipsy().trigger('mouseenter');
+        this.$el.on('mouseenter', '.oe_systray > div:not([data-toggle=tooltip])', function() {
+            $(this).attr('data-toggle', 'tooltip').tooltip().trigger('mouseenter');
         });
         this.$el.on('click', '.oe_dropdown_toggle', function(ev) {
             ev.preventDefault();
@@ -1286,7 +1286,8 @@ instance.web.Client = instance.web.Widget.extend({
             }, 0);
         });
         instance.web.bus.on('click', this, function(ev) {
-            $.fn.tipsy.clear();
+            $.fn.tooltip('destroy');
+            this.$el.find('.oe_systray').find('div')
             if (!$(ev.target).is('input[type=file]')) {
                 self.$el.find('.oe_dropdown_menu.oe_opened, .oe_dropdown_toggle.oe_opened').removeClass('oe_opened');
             }
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 683cdebbbf4..748f9bde4f8 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1819,7 +1819,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         this.$el.addClass(this.node.attrs["class"] || "");
     },
     destroy: function() {
-        $.fn.tipsy.clear();
+        $.fn.tooltip('destroy');
         this._super.apply(this, arguments);
     },
     /**
@@ -1851,9 +1851,9 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         widget = widget || this;
         trigger = trigger || this.$el;
         options = _.extend({
-                delayIn: 500,
-                delayOut: 0,
-                fade: true,
+                //delayIn: 500,
+                //delayOut: 0,
+                //fade: true,
                 title: function() {
                     var template = widget.template + '.tooltip';
                     if (!QWeb.has_template(template)) {
@@ -1864,12 +1864,14 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
                         widget: widget
                     });
                 },
-                gravity: $.fn.tipsy.autoBounds(50, 'nw'),
+                //gravity: $.fn.tooltip.autoBounds(50, 'nw'),
+                placement: 'right',
                 html: true,
-                opacity: 0.85,
-                trigger: 'hover'
+                //opacity: 0.85,
+                //trigger: 'hover'
             }, options || {});
-        $(trigger).tipsy(options);
+        $(trigger).attr('data-toggle', 'tooltip');
+        $(trigger).tooltip(options);
     },
     /**
      * Builds a new context usable for operations related to fields by merging
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 37369377bf1..80e72a5d813 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -585,7 +585,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         var self = this;
         this.$el.find('.oe_view_manager_switch a').click(function() {
             self.switch_mode($(this).data('view-type'));
-        }).tipsy();
+        }).tooltip();
         var views_ids = {};
         _.each(this.views_src, function(view) {
             self.views[view.view_type] = $.extend({}, view, {
@@ -1152,7 +1152,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
             $(this).toggle(!!$(this).find('li').length);
         });
 
-        self.$("[title]").tipsy({
+        self.$("[title]").tooltip({
             'html': true,
             'delayIn': 500,
         });
-- 
cgit v1.2.3


From 165d289384a40e08a475385a4d0ea0edbf1bca23 Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Tue, 3 Dec 2013 18:21:13 +0530
Subject: [IMP]Removed tipsy library and add placement in tooltip.

bzr revid: bth@tinyerp.com-20131203125113-fuapp6wpvmcif1c5
---
 addons/web/static/src/js/views.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 80e72a5d813..01b469d39d1 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -583,9 +583,10 @@ instance.web.ViewManager =  instance.web.Widget.extend({
     start: function() {
         this._super();
         var self = this;
+        this.$el.find('.oe_view_manager_switch a').attr('data-toggle', 'tooltip');
         this.$el.find('.oe_view_manager_switch a').click(function() {
             self.switch_mode($(this).data('view-type'));
-        }).tooltip();
+        }).tooltip({'placement': 'bottom'});
         var views_ids = {};
         _.each(this.views_src, function(view) {
             self.views[view.view_type] = $.extend({}, view, {
-- 
cgit v1.2.3


From 5d874a4acb1e2e60069d879bef4d49226492b4cd Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Wed, 4 Dec 2013 17:28:24 +0530
Subject: [IMP]Improved css and offset for tooltip.

bzr revid: bth@tinyerp.com-20131204115824-tbq4nys4c0d2c327
---
 addons/web/static/src/css/base.css    |  7 +++++++
 addons/web/static/src/js/view_form.js | 10 +++-------
 addons/web/static/src/js/views.js     |  6 +++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 010585ee4a0..96fbcf9f805 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -601,6 +601,7 @@
 }
 .openerp.oe_tooltip {
   font-size: 12px;
+  background-color: transparent;
 }
 .openerp.oe_tooltip .oe_tooltip_string {
   color: #ffdd55;
@@ -633,6 +634,12 @@
 .openerp.oe_tooltip .oe_tooltip_message {
   max-width: 310px;
 }
+.tooltip-inner {
+  text-align: left !important;
+}
+.tooltip.bottom .tooltip-arrow {
+  left: 12% !important;
+}
 .openerp .oe_notebook {
   margin: 8px 0;
   padding: 0 16px;
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 748f9bde4f8..ed6d66e5c68 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1851,9 +1851,6 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         widget = widget || this;
         trigger = trigger || this.$el;
         options = _.extend({
-                //delayIn: 500,
-                //delayOut: 0,
-                //fade: true,
                 title: function() {
                     var template = widget.template + '.tooltip';
                     if (!QWeb.has_template(template)) {
@@ -1864,11 +1861,10 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
                         widget: widget
                     });
                 },
-                //gravity: $.fn.tooltip.autoBounds(50, 'nw'),
-                placement: 'right',
+                container: 'body',
+                placement: 'bottom',
                 html: true,
-                //opacity: 0.85,
-                //trigger: 'hover'
+                opacity: 0.85,
             }, options || {});
         $(trigger).attr('data-toggle', 'tooltip');
         $(trigger).tooltip(options);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 01b469d39d1..f9e8018b183 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -586,7 +586,11 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         this.$el.find('.oe_view_manager_switch a').attr('data-toggle', 'tooltip');
         this.$el.find('.oe_view_manager_switch a').click(function() {
             self.switch_mode($(this).data('view-type'));
-        }).tooltip({'placement': 'bottom'});
+        }).tooltip({
+            container: 'body',
+            html: true,
+            opacity: 0.85
+        });
         var views_ids = {};
         _.each(this.views_src, function(view) {
             self.views[view.view_type] = $.extend({}, view, {
-- 
cgit v1.2.3


From f33076bcd8aba7a513636d45314c0ece3ff5614f Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Wed, 4 Dec 2013 17:52:37 +0530
Subject: [IMP]Set margin-top.

bzr revid: bth@tinyerp.com-20131204122237-lsymfmuoiyg5z371
---
 addons/web/static/src/css/base.css | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 96fbcf9f805..b4e6d4a24b2 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -639,6 +639,7 @@
 }
 .tooltip.bottom .tooltip-arrow {
   left: 12% !important;
+  margin-top: 0.5px;
 }
 .openerp .oe_notebook {
   margin: 8px 0;
-- 
cgit v1.2.3


From 3fd24e1cb5f67fa3c42476b9a6e6e5589ca21e3b Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Thu, 5 Dec 2013 11:50:07 +0530
Subject: [IMP]Add tooltip options and add for search view drawer.

bzr revid: bth@tinyerp.com-20131205062007-cbo6wuuyg1buy0we
---
 addons/web/static/src/css/base.css | 3 +++
 addons/web/static/src/js/chrome.js | 2 +-
 addons/web/static/src/js/search.js | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b4e6d4a24b2..6188b3fc26e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -641,6 +641,9 @@
   left: 12% !important;
   margin-top: 0.5px;
 }
+.tooltip.bottom {
+  padding: 5px 0 !important;
+}
 .openerp .oe_notebook {
   margin: 8px 0;
   padding: 0 16px;
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index c58089f4b5c..848f9e1ec3c 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1262,7 +1262,7 @@ instance.web.Client = instance.web.Widget.extend({
     bind_events: function() {
         var self = this;
         this.$el.on('mouseenter', '.oe_systray > div:not([data-toggle=tooltip])', function() {
-            $(this).attr('data-toggle', 'tooltip').tooltip().trigger('mouseenter');
+            $(this).attr('data-toggle', 'tooltip').tooltip({placement: 'bottom', html: true}).trigger('mouseenter');
         });
         this.$el.on('click', '.oe_dropdown_toggle', function(ev) {
             ev.preventDefault();
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c3ef682bfcc..50535150bf3 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -400,7 +400,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         this.query = new my.SearchQuery()
                 .on('add change reset remove', this.proxy('do_search'))
                 .on('add change reset remove', this.proxy('renderFacets'));
-
+        $('.oe_searchview_unfold_drawer').tooltip({html: true});
         if (this.options.hidden) {
             this.$el.hide();
         }
-- 
cgit v1.2.3


From ff5cc4d5d37e0580cb9ee20d963ad99a51389d21 Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Thu, 5 Dec 2013 12:19:03 +0530
Subject: [IMP]Container added for tooltip.

bzr revid: bth@tinyerp.com-20131205064903-222sb09tcsy4x79u
---
 addons/web/static/src/css/base.css | 3 ---
 addons/web/static/src/js/chrome.js | 2 +-
 addons/web/static/src/js/views.js  | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6188b3fc26e..b4e6d4a24b2 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -641,9 +641,6 @@
   left: 12% !important;
   margin-top: 0.5px;
 }
-.tooltip.bottom {
-  padding: 5px 0 !important;
-}
 .openerp .oe_notebook {
   margin: 8px 0;
   padding: 0 16px;
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 848f9e1ec3c..b80dfff695a 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1262,7 +1262,7 @@ instance.web.Client = instance.web.Widget.extend({
     bind_events: function() {
         var self = this;
         this.$el.on('mouseenter', '.oe_systray > div:not([data-toggle=tooltip])', function() {
-            $(this).attr('data-toggle', 'tooltip').tooltip({placement: 'bottom', html: true}).trigger('mouseenter');
+            $(this).attr('data-toggle', 'tooltip').tooltip({placement: 'bottom', html: true, container: 'body'}).trigger('mouseenter');
         });
         this.$el.on('click', '.oe_dropdown_toggle', function(ev) {
             ev.preventDefault();
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index f9e8018b183..ed81ccc253f 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1159,6 +1159,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
 
         self.$("[title]").tooltip({
             'html': true,
+            'container': 'body',
             'delayIn': 500,
         });
     },
-- 
cgit v1.2.3


From 63d66614c55b9e4947e84947cd210985362acf38 Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Thu, 5 Dec 2013 13:04:31 +0530
Subject: [IMP]Add attribute.

bzr revid: bth@tinyerp.com-20131205073431-rcmnwyph2fn0hzu8
---
 addons/web/static/src/js/search.js | 1 +
 addons/web/static/src/js/views.js  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 50535150bf3..0af8b451312 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -400,6 +400,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         this.query = new my.SearchQuery()
                 .on('add change reset remove', this.proxy('do_search'))
                 .on('add change reset remove', this.proxy('renderFacets'));
+        $('.oe_searchview_unfold_drawer').attr('data-toggle', 'tooltip');
         $('.oe_searchview_unfold_drawer').tooltip({html: true});
         if (this.options.hidden) {
             this.$el.hide();
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index ed81ccc253f..625eb4799eb 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1156,7 +1156,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
         this.$('.oe_form_dropdown_section').each(function() {
             $(this).toggle(!!$(this).find('li').length);
         });
-
+        self.$("[title]").attr('data-toggle', 'tooltip');
         self.$("[title]").tooltip({
             'html': true,
             'container': 'body',
-- 
cgit v1.2.3


From 21ac480edfbe3c01251aa300639e45242dcdffc9 Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Thu, 5 Dec 2013 16:47:14 +0530
Subject: [IMP]Add tooltip in kanban record and search view.

bzr revid: bth@tinyerp.com-20131205111714-zat05ycom5wtjzfd
---
 addons/web/static/src/js/search.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 0af8b451312..9022c8dbbe7 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1841,7 +1841,10 @@ instance.web.search.Filters = instance.web.search.Input.extend({
 
         return $.when(
             this.render_column(col1, $('<div>').appendTo(this.$el)),
-            this.render_column(col2, $('<div>').appendTo(this.$el)));
+            this.render_column(col2, $('<div>').appendTo(this.$el))).then(function () {
+                self.$el.children().find('[title]').attr('data-toggle', 'tooltip');
+                self.$el.children().find('[title]').tooltip({placement: 'bottom', html: true, container: 'body'});
+            });
     },
     render_column: function (column, $el) {
         return $.when.apply(null, _(column).map(function (group) {
-- 
cgit v1.2.3


From 188d42650009a5a4672b847158b481a43e7e5056 Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Fri, 6 Dec 2013 10:57:56 +0530
Subject: [IMP]Add sass changes.

bzr revid: bth@tinyerp.com-20131206052756-bqizhcsf2jwjn05k
---
 addons/web/static/src/css/base.sass | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e9a51370192..cf72a287549 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -534,6 +534,7 @@ $sheet-padding: 16px
     // Tooltips {{{
     &.oe_tooltip
         font-size: 12px
+        background-color: transparent
         .oe_tooltip_string
             color: #FD5
             font-weight: bold
@@ -557,6 +558,11 @@ $sheet-padding: 16px
                 cursor: pointer
         .oe_tooltip_message
             max-width: 310px
+    .tooltip-inner
+        text-align: left !important
+    .tooltip.bottom .tooltip-arrow
+        left: 12% !important
+        margin-top: 0.5px
     // }}}
     // Notebook {{{
     .oe_notebook
-- 
cgit v1.2.3


From 6ccb6423ead8a24c4dfe3d2033454d91acc168ec Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Fri, 6 Dec 2013 11:51:52 +0530
Subject: [IMP]Destroy tooltip.

bzr revid: bth@tinyerp.com-20131206062152-15fi8v8xokyux40m
---
 addons/web/static/src/js/views.js | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 625eb4799eb..63aba1dbde5 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -586,6 +586,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         this.$el.find('.oe_view_manager_switch a').attr('data-toggle', 'tooltip');
         this.$el.find('.oe_view_manager_switch a').click(function() {
             self.switch_mode($(this).data('view-type'));
+            $(this).tooltip('destroy');
         }).tooltip({
             container: 'body',
             html: true,
-- 
cgit v1.2.3


From ec96bb513b89c100873a0b7554bbd8941ba52b6e Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Wed, 11 Dec 2013 16:30:30 +0530
Subject: [IMP]Tooltip when field have help and on debug mode.

bzr revid: bth@tinyerp.com-20131211110030-tz3jf992ndmjgqe9
---
 addons/web/static/src/js/view_form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 05538fad897..d10bd7a97a5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2104,8 +2104,9 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
             this.$el.find('.oe_field_translate').click(this.on_translate);
         }
         this.$label = this.view ? this.view.$el.find('label[for=' + this.id_for_label + ']') : $();
-        if (instance.session.debug) {
+        if (this.field.help || instance.session.debug)
             this.do_attach_tooltip(this, this.$label[0] || this.$el);
+        if (instance.session.debug) {
             this.$label.off('dblclick').on('dblclick', function() {
                 console.log("Field '%s' of type '%s' in View: %o", self.name, (self.node.attrs.widget || self.field.type), self.view);
                 window.w = self;
-- 
cgit v1.2.3


From 40a4a06d068c639b873e3936efb58159f1dd7709 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (Open ERP)" <kch@tinyerp.com>
Date: Tue, 17 Dec 2013 13:01:58 +0530
Subject: [IMP]improved css for tooltip bottom, bottom arrow, text alignment.

bzr revid: kch@tinyerp.com-20131217073158-zjy4wbxenchxk2ax
---
 addons/web/static/src/css/base.css  | 20 ++++++++++----------
 addons/web/static/src/css/base.sass | 12 +++++++-----
 2 files changed, 17 insertions(+), 15 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b4e6d4a24b2..25d2bf2441f 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");
@@ -634,13 +634,6 @@
 .openerp.oe_tooltip .oe_tooltip_message {
   max-width: 310px;
 }
-.tooltip-inner {
-  text-align: left !important;
-}
-.tooltip.bottom .tooltip-arrow {
-  left: 12% !important;
-  margin-top: 0.5px;
-}
 .openerp .oe_notebook {
   margin: 8px 0;
   padding: 0 16px;
@@ -2298,7 +2291,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -3442,7 +3435,6 @@ div.ui-widget-overlay {
     overflow: hidden !important;
   }
 }
-
 .nav li > a {
   padding: 3px 4px 2px 18px;
   color: #4c4c4c;
@@ -3471,6 +3463,14 @@ div.ui-widget-overlay {
   background-color: #7c7bad;
 }
 
+.tooltip-inner {
+  text-align: left;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  left: 35%;
+}
+
 button, body {
   line-height: normal;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index cf72a287549..541a7f66d88 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -558,11 +558,6 @@ $sheet-padding: 16px
                 cursor: pointer
         .oe_tooltip_message
             max-width: 310px
-    .tooltip-inner
-        text-align: left !important
-    .tooltip.bottom .tooltip-arrow
-        left: 12% !important
-        margin-top: 0.5px
     // }}}
     // Notebook {{{
     .oe_notebook
@@ -2770,6 +2765,13 @@ div.ui-widget-overlay
     background-color: #7c7bad
 // End of customize
 
+// Customize bootstrap3 for tooltip
+.tooltip-inner
+    text-align: left
+.tooltip.bottom .tooltip-arrow
+    left: 35%
+// End of customize
+
 // Customize for global tags
 button, body
     line-height: normal
-- 
cgit v1.2.3


From 3fcd2e2440a7a5e87f7451453decf1462000ea35 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (Open ERP)" <kch@tinyerp.com>
Date: Tue, 17 Dec 2013 15:05:46 +0530
Subject: [IMP]Improved code for set tooltip placement on top or bottom on the
 basis of display area.

bzr revid: kch@tinyerp.com-20131217093546-49lg5i0rm1kx9oli
---
 addons/web/static/src/css/base.css    | 4 ++--
 addons/web/static/src/css/base.sass   | 4 ++--
 addons/web/static/src/js/search.js    | 2 +-
 addons/web/static/src/js/view_form.js | 7 ++++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 25d2bf2441f..06239a389cd 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3464,11 +3464,11 @@ div.ui-widget-overlay {
 }
 
 .tooltip-inner {
-  text-align: left;
+  text-align: left !important;
 }
 
 .tooltip.bottom .tooltip-arrow {
-  left: 35%;
+  left: 35% !important;
 }
 
 button, body {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 541a7f66d88..e74fae44206 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2767,9 +2767,9 @@ div.ui-widget-overlay
 
 // Customize bootstrap3 for tooltip
 .tooltip-inner
-    text-align: left
+    text-align: left !important
 .tooltip.bottom .tooltip-arrow
-    left: 35%
+    left: 35% !important
 // End of customize
 
 // Customize for global tags
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 1cc2b4815d0..994673021a3 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -401,7 +401,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
                 .on('add change reset remove', this.proxy('do_search'))
                 .on('add change reset remove', this.proxy('renderFacets'));
         $('.oe_searchview_unfold_drawer').attr('data-toggle', 'tooltip');
-        $('.oe_searchview_unfold_drawer').tooltip({html: true});
+        $('.oe_searchview_unfold_drawer').tooltip({placement: 'bottom', html: true});
         if (this.options.hidden) {
             this.$el.hide();
         }
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d10bd7a97a5..7ffbffd44f3 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1862,7 +1862,12 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
                     });
                 },
                 container: 'body',
-                placement: 'bottom',
+                placement: function(tip, trigger) {  //dynamic set position
+                    var offset = $(trigger).offset();
+                    var vert = 0.5 * $(document).outerHeight() - offset.top;
+                    var vertPlacement = vert > 0 ? 'bottom' : 'top';
+                    return vertPlacement;
+                },
                 html: true,
                 opacity: 0.85,
             }, options || {});
-- 
cgit v1.2.3


From e6112472cede1ee52497e8f91541fbaf8d5a7531 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (Open ERP)" <kch@tinyerp.com>
Date: Tue, 17 Dec 2013 15:11:57 +0530
Subject: [FIX]css issue.

bzr revid: kch@tinyerp.com-20131217094157-i45wv6xs1uz38kin
---
 addons/web/static/src/css/base.css  | 3 ++-
 addons/web/static/src/css/base.sass | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 06239a389cd..008d811f30c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3465,10 +3465,11 @@ div.ui-widget-overlay {
 
 .tooltip-inner {
   text-align: left !important;
+  max-width: 250px;
 }
 
 .tooltip.bottom .tooltip-arrow {
-  left: 35% !important;
+  left: 50%;
 }
 
 button, body {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e74fae44206..549b89e2b21 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2768,8 +2768,9 @@ div.ui-widget-overlay
 // Customize bootstrap3 for tooltip
 .tooltip-inner
     text-align: left !important
+    max-width: 250px
 .tooltip.bottom .tooltip-arrow
-    left: 35% !important
+    left: 50%
 // End of customize
 
 // Customize for global tags
-- 
cgit v1.2.3


From 00362f60c987eb0ca44dc65902f4f9a0960af90a Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (Open ERP)" <kch@tinyerp.com>
Date: Wed, 18 Dec 2013 13:04:40 +0530
Subject: [IMP]customize bootstrap tooltip classes.

bzr revid: kch@tinyerp.com-20131218073440-c7sfdn0jfw0cw83n
---
 addons/web/static/src/css/base.css  | 80 +++++++++++++++++++------------------
 addons/web/static/src/css/base.sass | 68 ++++++++++++++++---------------
 2 files changed, 76 insertions(+), 72 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 008d811f30c..4dce5647458 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -599,41 +599,6 @@
   font-style: italic;
   text-decoration: none;
 }
-.openerp.oe_tooltip {
-  font-size: 12px;
-  background-color: transparent;
-}
-.openerp.oe_tooltip .oe_tooltip_string {
-  color: #ffdd55;
-  font-weight: bold;
-  font-size: 13px;
-}
-.openerp.oe_tooltip .oe_tooltip_help {
-  white-space: pre-wrap;
-}
-.openerp.oe_tooltip .oe_tooltip_technical {
-  padding: 0 0 4px 0;
-  margin: 5px 0 0 15px;
-}
-.openerp.oe_tooltip .oe_tooltip_technical li {
-  list-style: circle;
-}
-.openerp.oe_tooltip .oe_tooltip_technical_title {
-  font-weight: bold;
-}
-.openerp.oe_tooltip .oe_tooltip_close {
-  margin: -5px 0 0 2px;
-  cursor: default;
-  float: right;
-  color: white;
-}
-.openerp.oe_tooltip .oe_tooltip_close:hover {
-  color: #999999;
-  cursor: pointer;
-}
-.openerp.oe_tooltip .oe_tooltip_message {
-  max-width: 310px;
-}
 .openerp .oe_notebook {
   margin: 8px 0;
   padding: 0 16px;
@@ -3463,13 +3428,50 @@ div.ui-widget-overlay {
   background-color: #7c7bad;
 }
 
-.tooltip-inner {
+.tooltip {
+  padding: 0;
+  margin: 0;
+  font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+  color: #4c4c4c;
+  font-size: 12px;
+  background: white;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
+  background-color: transparent;
+}
+.tooltip .tooltip-inner {
   text-align: left !important;
   max-width: 250px;
 }
-
-.tooltip.bottom .tooltip-arrow {
-  left: 50%;
+.tooltip .tooltip-inner .oe_tooltip_string {
+  color: #ffdd55;
+  font-weight: bold;
+  font-size: 13px;
+}
+.tooltip .tooltip-inner .oe_tooltip_help {
+  white-space: pre-wrap;
+}
+.tooltip .tooltip-inner .oe_tooltip_technical {
+  padding: 0 0 4px 0;
+  margin: 5px 0 0 15px;
+}
+.tooltip .tooltip-inner .oe_tooltip_technical li {
+  list-style: circle;
+}
+.tooltip .tooltip-inner .oe_tooltip_technical_title {
+  font-weight: bold;
+}
+.tooltip .tooltip-inner .oe_tooltip_close {
+  margin: -5px 0 0 2px;
+  cursor: default;
+  float: right;
+  color: white;
+}
+.tooltip .tooltip-inner .oe_tooltip_close:hover {
+  color: #999999;
+  cursor: pointer;
+}
+.tooltip .tooltip-inner .oe_tooltip_message {
+  max-width: 310px;
 }
 
 button, body {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 549b89e2b21..941ce32231c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -531,34 +531,6 @@ $sheet-padding: 16px
                 text-decoration: none
         margin-bottom: 1px
     // }}}
-    // Tooltips {{{
-    &.oe_tooltip
-        font-size: 12px
-        background-color: transparent
-        .oe_tooltip_string
-            color: #FD5
-            font-weight: bold
-            font-size: 13px
-        .oe_tooltip_help
-            white-space: pre-wrap
-        .oe_tooltip_technical
-            padding: 0 0 4px 0
-            margin: 5px 0 0 15px
-            li
-                list-style: circle
-        .oe_tooltip_technical_title
-            font-weight: bold
-        .oe_tooltip_close
-            margin: -5px 0 0 2px
-            cursor: default
-            float: right
-            color: white
-            &:hover
-                color: #999
-                cursor: pointer
-        .oe_tooltip_message
-            max-width: 310px
-    // }}}
     // Notebook {{{
     .oe_notebook
         margin: 8px 0
@@ -2766,11 +2738,41 @@ div.ui-widget-overlay
 // End of customize
 
 // Customize bootstrap3 for tooltip
-.tooltip-inner
-    text-align: left !important
-    max-width: 250px
-.tooltip.bottom .tooltip-arrow
-    left: 50%
+.tooltip
+    padding: 0
+    margin: 0
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
+    color: #4c4c4c
+    font-size: 12px
+    background: white
+    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5)
+    background-color: transparent
+    .tooltip-inner
+        text-align: left !important
+        max-width: 250px
+        .oe_tooltip_string
+            color: #FD5
+            font-weight: bold
+            font-size: 13px
+        .oe_tooltip_help
+            white-space: pre-wrap
+        .oe_tooltip_technical
+            padding: 0 0 4px 0
+            margin: 5px 0 0 15px
+            li
+                list-style: circle
+        .oe_tooltip_technical_title
+            font-weight: bold
+        .oe_tooltip_close
+            margin: -5px 0 0 2px
+            cursor: default
+            float: right
+            color: white
+            &:hover
+                color: #999
+                cursor: pointer
+        .oe_tooltip_message
+            max-width: 310px
 // End of customize
 
 // Customize for global tags
-- 
cgit v1.2.3


From 5e5483bde4bb6329aab389f68f09121426e43312 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 20 Dec 2013 13:02:41 +0530
Subject: [FIX]for dialog box stick to page.

bzr revid: vme@tinyerp.com-20131220073241-xi7v47jecgewapw2
---
 addons/web/static/src/js/chrome.js    | 5 ++++-
 addons/web/static/src/js/view_form.js | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index b80dfff695a..a87af20af69 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -238,6 +238,10 @@ instance.web.Dialog = instance.web.Widget.extend({
         if (this.dialog_inited && !this.isDestroyed() && this.$el.is(":data(dialog)")) {
             this.$el.dialog('destroy');
         }
+        //For Remove tooltip from dialog box when destroy
+        //Bad fix, bootstrap mouseleave method call very late
+        //before that this.$el and its contained removed because that tooltip sticks on page.
+        $($.find('.tooltip.fade.in')).remove();
         this._super();
     }
 });
@@ -1287,7 +1291,6 @@ instance.web.Client = instance.web.Widget.extend({
         });
         instance.web.bus.on('click', this, function(ev) {
             $.fn.tooltip('destroy');
-            this.$el.find('.oe_systray').find('div')
             if (!$(ev.target).is('input[type=file]')) {
                 self.$el.find('.oe_dropdown_menu.oe_opened, .oe_dropdown_toggle.oe_opened').removeClass('oe_opened');
             }
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 7ffbffd44f3..683794cac68 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1851,6 +1851,8 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
         widget = widget || this;
         trigger = trigger || this.$el;
         options = _.extend({
+                delay: { show: 750, hide: 0 },
+                trigger: 'hover',
                 title: function() {
                     var template = widget.template + '.tooltip';
                     if (!QWeb.has_template(template)) {
-- 
cgit v1.2.3


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: [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(-)

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

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'">
-- 
cgit v1.2.3


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: [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(-)

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

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
-- 
cgit v1.2.3


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: [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(-)

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

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
-- 
cgit v1.2.3


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: [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(-)

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

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();
-- 
cgit v1.2.3


From 254985f4179220190e3f592a06d7897b92a928d4 Mon Sep 17 00:00:00 2001
From: Amit Vora <avo@tinyerp.com>
Date: Tue, 1 Apr 2014 13:03:09 +0530
Subject: [FIX] Fixed the generic issue of radio button align.

bzr revid: avo@tinyerp.com-20140401073309-3e0ynl5z1q92hfm8
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6a20442ed41..bbac7a76eee 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -576,7 +576,7 @@
   display: inline-block;
   height: 12px;
   width: 12px;
-  vertical-align: bottom;
+  vertical-align: top;
   border-radius: 10px;
   margin: 1px 0;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 38a47eed1c5..e8103b4bc53 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -514,7 +514,7 @@ $sheet-padding: 16px
                 display: inline-block
                 height: 12px
                 width: 12px
-                vertical-align: bottom
+                vertical-align: top
                 border-radius: 10px
                 margin: 1px 0
             &.oe_form_invalid
-- 
cgit v1.2.3


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: [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(-)

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

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>
-- 
cgit v1.2.3


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: [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(-)

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

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`.
  *
-- 
cgit v1.2.3


From e95ca69113bf3b37c82c3e2cab7e6636592c9508 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 10 Apr 2014 12:06:31 +0200
Subject: [REF]add bootstrap modal window based, cleaned, refactored from
 trunk-ui-to-boostrap-modal branch

bzr revid: csn@openerp.com-20140410100631-5v6a71oi5wyunbda
---
 addons/web/static/src/css/base.css      | 169 ++++----------------------------
 addons/web/static/src/css/base.sass     | 127 ++++--------------------
 addons/web/static/src/js/chrome.js      | 135 +++++++++++++++----------
 addons/web/static/src/js/data_export.js |   2 -
 addons/web/static/src/js/view_form.js   |  36 +++----
 addons/web/static/src/js/views.js       |   4 +-
 addons/web/static/src/xml/base.xml      |  15 ++-
 7 files changed, 150 insertions(+), 338 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3125d9e938b..22bb7d41c66 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -127,7 +127,7 @@
   font-weight: bold;
   font-size: inherit;
 }
-.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp .oe_button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
+.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp .oe_button, .openerp input[type='submit'] {
   display: inline-block;
   border: 1px solid rgba(0, 0, 0, 0.4);
   color: #4c4c4c;
@@ -152,7 +152,7 @@
   -webkit-font-smoothing: antialiased;
   outline: none;
 }
-.openerp a.button:hover, .openerp button:hover, .openerp .oe_button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover {
+.openerp a.button:hover, .openerp button:hover, .openerp .oe_button:hover, .openerp input[type='submit']:hover {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
   background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
@@ -163,7 +163,7 @@
   cursor: pointer;
   background-position: 0;
 }
-.openerp a.button:focus, .openerp button:focus, .openerp .oe_button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus {
+.openerp a.button:focus, .openerp button:focus, .openerp .oe_button:focus, .openerp input[type='submit']:focus {
   border: 1px solid #80bfff;
   background-position: 0;
   background-color: #ececec;
@@ -177,7 +177,7 @@
   -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
-.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp .oe_button:active, .openerp .oe_button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active {
+.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp .oe_button:active, .openerp .oe_button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
   background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6);
@@ -212,148 +212,6 @@
 .openerp .ui-tabs {
   position: static;
 }
-.openerp.ui-dialog {
-  display: none;
-  height: auto !important;
-  padding: 6px;
-  background-color: rgba(60, 60, 60, 0.7);
-  border: 1px solid;
-  border-color: #888888 #555555 #444444;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-  -moz-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
-  -webkit-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
-  box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-}
-.openerp.ui-dialog .ui-dialog-content {
-  padding: 0;
-}
-.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane {
-  padding: 16px;
-}
-.openerp.ui-dialog .ui-dialog-titlebar {
-  border-top: none;
-  border-left: none;
-  border-right: none;
-  border-bottom: 1px solid #cacaca;
-  -moz-border-radius: 2px 2px 0 0;
-  -webkit-border-radius: 2px 2px 0 0;
-  border-radius: 2px 2px 0 0;
-  background-color: #ededed;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
-  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
-}
-.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title {
-  margin: 0;
-  padding: 0;
-}
-.openerp.ui-dialog .ui-dialog-content {
-  background: white;
-  width: auto !important;
-}
-.openerp.ui-dialog .ui-dialog-buttonpane {
-  border-top: 1px solid #e0e0e0;
-  background: #f5f7f9;
-  margin: 0;
-  -moz-border-radius: 0 0 2px 2px;
-  -webkit-border-radius: 0 0 2px 2px;
-  border-radius: 0 0 2px 2px;
-}
-.openerp.ui-dialog .ui-dialog-buttonpane button {
-  margin: 0 4px 0 0;
-}
-.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-  float: left;
-}
-.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
-  margin-right: 4px;
-}
-.openerp.ui-dialog .ui-dialog-titlebar-close {
-  padding: 0;
-}
-.openerp.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick {
-  display: none;
-}
-.openerp.ui-dialog .ui-dialog-titlebar-close:before {
-  content: "×";
-  font-size: 18px;
-  font-weight: bold;
-  line-height: 16px;
-  color: black;
-  text-shadow: 0 1px 0 white;
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-}
-.openerp.ui-dialog .ui-dialog-titlebar-close:before:hover {
-  color: black;
-  text-decoration: none;
-}
-.openerp.ui-dialog .oe_about {
-  background-color: white;
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
-  -moz-border-radius: 0 0 2px 2px;
-  -webkit-border-radius: 0 0 2px 2px;
-  border-radius: 0 0 2px 2px;
-}
-.openerp.ui-dialog .oe_about a {
-  color: #7c7bad;
-}
-.openerp.ui-dialog .oe_about a:hover {
-  text-decoration: underline;
-}
-.openerp.ui-dialog .oe_about a:focus {
-  outline: none;
-}
-.openerp.ui-dialog .oe_about .oe_logo {
-  margin-left: -6px;
-}
-.openerp.ui-dialog .oe_about .oe_bottom {
-  position: absolute;
-  top: 50%;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  text-shadow: 0 1px 1px #999999;
-  background-color: #8a0e0e;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
-  background-image: -webkit-linear-gradient(top, #b41616, #600606);
-  background-image: -moz-linear-gradient(top, #b41616, #600606);
-  background-image: -ms-linear-gradient(top, #b41616, #600606);
-  background-image: -o-linear-gradient(top, #b41616, #600606);
-  background-image: linear-gradient(to bottom, #b41616, #600606);
-  color: #eeeeee;
-  padding: 0 16px;
-  -moz-border-radius: 0 0 2px 2px;
-  -webkit-border-radius: 0 0 2px 2px;
-  border-radius: 0 0 2px 2px;
-}
-.openerp.ui-dialog .oe_about .oe_bottom a {
-  color: #eeeeee;
-}
-.openerp.ui-dialog.oe_act_window .ui-dialog-content {
-  padding: 0px;
-}
-.openerp .modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: black;
-  filter: alpha(opacity=30);
-  opacity: 0.3;
-}
 .openerp .oe_i {
   font-family: "mnmliconsRegular" !important;
   font-size: 21px;
@@ -1234,10 +1092,8 @@
 }
 .openerp .oe_about .oe_bottom {
   position: absolute;
-  top: 50%;
   left: 0;
   right: 0;
-  bottom: 0;
   text-shadow: 0 1px 1px #999999;
   background-color: #8a0e0e;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
@@ -3426,9 +3282,6 @@ body.oe_single_form .oe_single_form_container {
 .openerp_ie ul.oe_form_status li.oe_active > .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active > .arrow span {
   background-color: #729fcf !important;
 }
-.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8');
-}
 
 @media print {
   .openerp {
@@ -3474,7 +3327,19 @@ body.oe_single_form .oe_single_form_container {
   width: 18px;
   height: 18px;
 }
-
+.modal .modal-header button.close {
+  border: none;
+  background: none;
+  padding: 1px;
+  height: 18px;
+  font-size: 20px;
+}
+.modal .modal-footer {
+  text-align: left;
+}
+.modal .oe_act_window.modal-body{
+  padding: 0;
+}
 input[type="radio"], input[type="checkbox"] {
   margin-right: 4px;
   margin-left: 4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index ca77310b0d9..335e04f2424 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -218,7 +218,7 @@ $sheet-padding: 16px
         font-size: inherit
     // }}}
     // Button style {{{
-    a.button:link, a.button:visited, button, .oe_button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
+    a.button:link, a.button:visited, button, .oe_button, input[type='submit']
         display: inline-block
         border: 1px solid rgba(0,0,0,0.4)
         color: #4c4c4c
@@ -233,18 +233,18 @@ $sheet-padding: 16px
         -webkit-font-smoothing: antialiased
         outline: none
 
-    a.button:hover, button:hover,.oe_button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover
+    a.button:hover, button:hover,.oe_button:hover, input[type='submit']:hover
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         cursor: pointer
         background-position: 0
 
-    a.button:focus, button:focus, .oe_button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus
+    a.button:focus, button:focus, .oe_button:focus, input[type='submit']:focus
         border: 1px solid #80bfff
         background-position: 0
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset))
 
-    a.button:active, a.button.active, button:active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active
+    a.button:active, a.button.active, button:active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active
         @include vertical-gradient(#e3e3e3, #f6f6f6)
         @include box-shadow(none)
 
@@ -272,105 +272,6 @@ $sheet-padding: 16px
     .ui-tabs
         position: static
 
-    // Modal box
-    &.ui-dialog
-        display: none
-        height: auto !important
-        padding: 6px
-        //overflow: hidden
-        background-color: rgba(60,60,60,0.7)
-        border: 1px solid
-        border-color: #888 #555 #444
-        //overflow: hidden
-        @include radius(8px)
-        @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6))
-        @include background-clip()
-        .ui-dialog-content
-            padding: 0
-        .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
-            padding: 16px
-        .ui-dialog-titlebar
-            border-top: none
-            border-left: none
-            border-right: none
-            border-bottom: 1px solid #cacaca
-            @include radius(2px 2px 0 0)
-            @include vertical-gradient(#FCFCFC, #DEDEDE)
-            .ui-dialog-title
-                margin: 0
-                padding: 0
-        .ui-dialog-content
-            background: white
-            width: auto !important
-        .ui-dialog-buttonpane
-            border-top: 1px solid #e0e0e0
-            background: #f5f7f9
-            margin: 0
-            @include radius(0 0 2px 2px)
-            button
-                margin: 0 4px 0 0
-            .ui-dialog-buttonset
-                float: left
-                .ui-button
-                    margin-right: 4px
-        .ui-dialog-titlebar-close
-            padding: 0
-            .ui-icon-closethick
-                display: none
-            &:before
-                content: "×"
-                font-size: 18px
-                font-weight: bold
-                line-height: 16px
-                color: black
-                text-shadow: 0 1px 0 white
-                padding: 0
-                cursor: pointer
-                background: transparent
-                border: 0
-                &:hover
-                    color: black
-                    text-decoration: none
-        .oe_about
-            background-color: white
-            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
-            @include radius(0 0 2px 2px)
-            a
-                color: $link-color
-                &:hover
-                    text-decoration: underline
-                &:focus
-                    outline: none
-            .oe_logo
-                margin-left: -6px
-            .oe_bottom
-                position: absolute
-                top: 50%
-                left: 0
-                right: 0
-                bottom: 0
-                text-shadow: 0 1px 1px #999999
-                @include vertical-gradient(#b41616, #600606)
-                color: #eee
-                padding: 0 16px
-                @include radius(0 0 2px 2px)
-                a
-                    color: #eee
-
-    &.ui-dialog.oe_act_window
-        .ui-dialog-content
-            padding: 0px
-
-    .modal-backdrop
-        position: fixed
-        top: 0
-        right: 0
-        bottom: 0
-        left: 0
-        z-index: 1040
-        background-color: black
-        @include opacity(.3)
-
     // }}}
     // Generic classes {{{
     .oe_i
@@ -1031,10 +932,8 @@ $sheet-padding: 16px
             margin-left: -6px
         .oe_bottom
             position: absolute
-            top: 50%
             left: 0
             right: 0
-            bottom: 0
             text-shadow: 0 1px 1px #999999
             @include vertical-gradient(#b41616, #600606)
             color: #eee
@@ -2765,9 +2664,6 @@ body.oe_single_form
             > .arrow span
                 background-color: #729fcf !important
 
-    // jquery ui for ie
-    .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
-        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8')
 // }}}
 
 // @media print {{{
@@ -2812,6 +2708,21 @@ body.oe_single_form
     height: 18px
 // End hack}}}
 
+// Customized modal according bootstrap3
+.modal
+    .modal-header
+        button.close
+            border: none
+            background: none
+            padding: 1px
+            height: 18px
+            font-size: 20px
+    .modal-footer
+        text-align: left
+    &.oe_act_window
+        .modal-body
+            padding: 0
+
 input[type="radio"], input[type="checkbox"]
     margin-right: 4px
     margin-left: 4px
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index de56927799e..f9085af3854 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -56,16 +56,6 @@ instance.web.action_warn = function(element, action) {
 };
 instance.web.client_actions.add("action_warn", "instance.web.action_warn");
 
-/**
- * The very minimal function everything should call to create a dialog
- * in OpenERP Web Client.
- */
-instance.web.dialog = function(element) {
-    var result = element.dialog.apply(element, _.rest(_.toArray(arguments)));
-    result.dialog("widget").openerpClass();
-    return result;
-};
-
 /**
     A useful class to handle dialogs.
 
@@ -91,10 +81,11 @@ instance.web.Dialog = instance.web.Widget.extend({
     */
     init: function (parent, options, content) {
         var self = this;
+        this.css_layout_outer = ['width','min_width','max_width'];
+        this.css_layout_inner = ['height','min_height','max_height'];
         this._super(parent);
         this.content_to_set = content;
         this.dialog_options = {
-            modal: true,
             destroy_on_close: true,
             width: 900,
             min_width: 0,
@@ -102,18 +93,14 @@ instance.web.Dialog = instance.web.Widget.extend({
             height: 'auto',
             min_height: 0,
             max_height: $(window.top).height() - 200,
-            autoOpen: false,
-            position: [false, 40],
+            resizable: true,
             buttons: null,
-            resizeStop: function() {
-                self.trigger("resized");
-            },
         };
         if (options) {
             _.extend(this.dialog_options, options);
         }
         this.on("closing", this, this._closing);
-        this.$buttons = $('<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"><span class="oe_dialog_custom_buttons"/></div>');
+        this.$buttons = $('<div class="modal-footer"><span class="oe_dialog_custom_buttons"/></div>');
     },
     _get_options: function() {
         var self = this;
@@ -133,6 +120,20 @@ instance.web.Dialog = instance.web.Widget.extend({
                 o[unit] = o['max_' + unit];
             }
         });
+        var layout_inner = {};
+        var layout_outer = {};
+        _.each(o, function(value,key){
+            if (_.contains(self.css_layout_inner, ''+key+'')){
+                layout_inner[key] = value;
+                delete o[key];
+            }
+            if (_.contains(self.css_layout_outer, ''+key+'')){
+                layout_outer[key] = value;
+                delete o[key];
+            }
+        });
+        o.layout_inner = layout_inner;
+        o.layout_outer = layout_outer;
         o.title = o.title || this.dialog_title;
         return o;
     },
@@ -162,8 +163,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         if (!this.dialog_inited) {
             this.init_dialog();
         }
-        this.$el.dialog('open');
-        this.$el.dialog("widget").append(this.$buttons);
+        this.$buttons.insertAfter(this.$dialog_box.find(".modal-body"));
         return this;
     },
     _add_buttons: function(buttons) {
@@ -188,16 +188,49 @@ instance.web.Dialog = instance.web.Widget.extend({
         @return The result returned by start().
     */
     init_dialog: function() {
+        var self = this;
         var options = this._get_options();
         if (options.buttons) {
             this._add_buttons(options.buttons);
             delete(options.buttons);
         }
         this.renderElement();
-        instance.web.dialog(this.$el, options);
-        if (options.height === 'auto' && options.max_height) {
-            this.$el.css({ 'max-height': options.max_height, 'overflow-y': 'auto' });
+
+        this.$dialog_box = $(QWeb.render('Dialog', options)).appendTo("body");
+        this.$el.modal({
+            'backdrop': false,
+            'keyboard': true,
+        });
+        this.$el.appendTo(this.$dialog_box.find(".modal-body"));
+        var dialog_body = this.$dialog_box.find('.modal-content');
+        if (options.layout_outer || options.layout_inner){
+            dialog_body.parent().css(options.layout_outer);
+            dialog_body.css(options.layout_inner);
         }
+        if (options.dialogClass){
+            dialog_body.find(".modal-body").addClass(options.dialogClass);
+        }
+        dialog_body.openerpClass();
+        dialog_body.draggable({ handle: ".modal-header", containment: "window" });
+        this.$dialog_box.on('hidden.bs.modal',this,function(){
+            self.trigger("closing");
+        });
+        this.$dialog_box.modal('show');
+
+        if (options.layout_inner.height === 'auto' && options.layout_inner.max_height) {
+            this.$el.css({ 'max-height': options.layout_inner.max_height, 'overflow-y': 'auto' });
+        }
+        var dialog_body = this.$dialog_box.find('.modal-content');
+        if (options.resizable){
+            dialog_body.resizable({ handles: 'n, e, s, w, ne, se, sw, nw' });
+        }
+        dialog_body.resize(function() {
+            var main_modal = dialog_body.parent();
+            var modal_body = main_modal.find(".modal-body .in");
+            var modal_content = main_modal.find(".modal-content").height();
+            modal_body.height(modal_content - 150);
+            main_modal.find(".modal-content").height((modal_body.height() + main_modal.find(".modal-header").height() + main_modal.find(".modal-footer").height()) + 85);
+        });
         this.dialog_inited = true;
         var res = this.start();
         return res;
@@ -206,9 +239,8 @@ instance.web.Dialog = instance.web.Widget.extend({
         Closes the popup, if destroy_on_close was passed to the constructor, it is also destroyed.
     */
     close: function(reason) {
-        if (this.dialog_inited && this.$el.is(":data(dialog)")) {
-            this.trigger("closing", reason);
-            this.$el.dialog('close');
+        if (this.dialog_inited && this.$el.is(":data(bs.modal)")) {
+            this.$el.parents('.modal').modal('hide');
         }
     },
     _closing: function() {
@@ -233,8 +265,8 @@ instance.web.Dialog = instance.web.Widget.extend({
             this.close(reason);
             this.__tmp_dialog_destroying = undefined;
         }
-        if (this.dialog_inited && !this.isDestroyed() && this.$el.is(":data(dialog)")) {
-            this.$el.dialog('destroy');
+        if (this.dialog_inited && !this.isDestroyed() && this.$el.is(":data(bs.modal)")) {
+            this.$el.parents('.modal').remove();
         }
         this._super();
     }
@@ -272,12 +304,12 @@ instance.web.CrashManager = instance.web.Class.extend({
         if (error.data.exception_type === "except_osv") {
             error = _.extend({}, error, {data: _.extend({}, error.data, {message: error.data.arguments[0] + "\n\n" + error.data.arguments[1]})});
         }
-        instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
+        new instance.web.Dialog(this, {
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
-            ]
-        });
+                {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
+            ],
+        }, $('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>')).open();
     },
     show_error: function(error) {
         if (!this.active) {
@@ -285,17 +317,13 @@ instance.web.CrashManager = instance.web.Class.extend({
         }
         var buttons = {};
         buttons[_t("Ok")] = function() {
-            $(this).dialog("close");
+            this.parents('.modal').modal('hide');
         };
-        var dialog = new instance.web.Dialog(this, {
+        new instance.web.Dialog(this, {
             title: "OpenERP " + _.str.capitalize(error.type),
             width: '80%',
-            height: '50%',
-            min_width: '800px',
-            min_height: '600px',
             buttons: buttons
-        }).open();
-        dialog.$el.html(QWeb.render('CrashManager.error', {session: instance.session, error: error}));
+        }, QWeb.render('CrashManager.error', {session: instance.session, error: error})).open();
     },
     show_message: function(exception) {
         this.show_error({
@@ -342,16 +370,16 @@ instance.web.RedirectWarningHandler = instance.web.Dialog.extend(instance.web.Ex
         error = this.error;
         error.data.message = error.data.arguments[0];
 
-        instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
+        new instance.web.Dialog(this, {
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }},
+                {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }},
                 {text: error.data.arguments[2], click: function() {
                     window.location.href='#action='+error.data.arguments[1];
-                    $(this).dialog("close");
+                    this.$el.parents('.modal').modal('hide');
                 }}
-            ]
-        });
+            ],
+        }, QWeb.render('CrashManager.warning', {error: error}));
         this.destroy();
     }
 });
@@ -498,13 +526,12 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
      * @param {String} error.error message of the error dialog
      */
     display_error: function (error) {
-        return instance.web.dialog($('<div>'), {
-            modal: true,
+        return new instance.web.Dialog(this, {
             title: error.title,
             buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
             ]
-        }).html(error.error);
+        }, $('<div>').html(error.error)).open();
     },
     do_create: function(form) {
         var self = this;
@@ -731,13 +758,12 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
        });
     },
     display_error: function (error) {
-        return instance.web.dialog($('<div>'), {
-            modal: true,
+        return new instance.web.Dialog(this, {
             title: error.title,
             buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
             ]
-        }).html(error.error);
+        }, $('<div>').html(error.error)).open();
     },
 });
 instance.web.client_actions.add("change_password", "instance.web.ChangePassword");
@@ -1052,8 +1078,11 @@ instance.web.UserMenu =  instance.web.Widget.extend({
                 e.preventDefault();
                 window.location = $.param.querystring( window.location.href, 'debug');
             });
-            instance.web.dialog($help, {autoOpen: true,
-                modal: true, width: 507, height: 290, resizable: false, title: _t("About")});
+            new instance.web.Dialog(this, {
+                resizable: false,
+                title: _t("About"),
+                width: 507, height: 290,
+            }, $help).open();
         });
     },
 });
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 252a5a378cc..2de933f45e8 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -46,7 +46,6 @@ instance.web.DataExport = instance.web.Dialog.extend({
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
-        self.$el.removeClass('ui-dialog-content ui-widget-content');
 
         var got_fields = new $.Deferred();
         this.$el.find('#import_compat').change(function() {
@@ -413,7 +412,6 @@ instance.web.DataExport = instance.web.Dialog.extend({
         });
     },
     close: function() {
-        this.$el.remove();
         this._super();
     }
 });
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 34e5d26c7c2..79bd078b6de 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -586,13 +586,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             this._internal_set_values(result.value, processed);
         }
         if (!_.isEmpty(result.warning)) {
-            instance.web.dialog($(QWeb.render("CrashManager.warning", result.warning)), {
+            new instance.web.Dialog(this, {
                 title:result.warning.title,
-                modal: true,
                 buttons: [
-                    {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                    {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
                 ]
-            });
+            }, QWeb.render("CrashManager.warning", result.warning)).open();
         }
 
         return $.Deferred().resolve();
@@ -1080,7 +1079,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 };
             })
             .value();
-
         var d = new instance.web.Dialog(this, {
             title: _t("Set Default"),
             args: {
@@ -1956,26 +1954,23 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
         var exec_action = function() {
             if (self.node.attrs.confirm) {
                 var def = $.Deferred();
-                var dialog = instance.web.dialog($('<div/>').text(self.node.attrs.confirm), {
+                var dialog = instance.web.Dialog(this, {
                     title: _t('Confirm'),
-                    modal: true,
                     buttons: [
                         {text: _t("Cancel"), click: function() {
-                                $(this).dialog("close");
+                                this.parents('.modal').modal('hide');
                             }
                         },
                         {text: _t("Ok"), click: function() {
                                 var self2 = this;
                                 self.on_confirmed().always(function() {
-                                    $(self2).dialog("close");
+                                    self2.parents('.modal').modal('hide');
                                 });
                             }
                         }
                     ],
-                    beforeClose: function() {
-                        def.resolve();
-                    },
-                });
+                }, $('<div/>').text(self.node.attrs.confirm)).open();
+                dialog.on("closing", null, function() {def.resolve();});
                 return def.promise();
             } else {
                 return self.on_confirmed();
@@ -3302,7 +3297,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
             delete this.$drop_down;
         }
         if (this.$input) {
-            this.$input.closest(".ui-dialog .ui-dialog-content").off('scroll');
+            this.$input.closest(".modal .modal-content").off('scroll');
             this.$input.off('keyup blur autocompleteclose autocompleteopen ' +
                             'focus focusout change keydown');
             delete this.$input;
@@ -3395,7 +3390,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 self.$input.autocomplete("close");
             }
         }, 50);
-        this.$input.closest(".ui-dialog .ui-dialog-content").on('scroll', this, close_autocomplete);
+        this.$input.closest(".modal .modal-content").on('scroll', this, close_autocomplete);
 
         self.ed_def = $.Deferred();
         self.uned_def = $.Deferred();
@@ -4919,11 +4914,11 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
         var dialog = new instance.web.Dialog(this, {
             min_width: '800px',
             dialogClass: 'oe_act_window',
-            close: function() {
-                self.check_exit(true);
-            },
             title: this.options.title || "",
         }, this.$el).open();
+        dialog.on('closing', this, function (e){
+            self.check_exit(true);
+        });
         this.$buttonpane = dialog.$buttons;
         this.start();
     },
@@ -4970,6 +4965,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
                 });
             });
             var $cbutton = self.$buttonpane.find(".oe_abstractformpopup-form-close");
+            // $cbutton = $cbutton.add(self.$el.parents('.modal:first').find('.close')[0]);
             $cbutton.click(function() {
                 self.view_form.trigger('on_button_cancel');
                 self.check_exit();
@@ -4990,8 +4986,8 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
     },
     destroy: function () {
         this.trigger('closed');
-        if (this.$el.is(":data(dialog)")) {
-            this.$el.dialog('close');
+        if (this.$el.is(":data(bs.modal)")) {
+            this.$el.parents('.modal').modal('hide');
         }
         this._super();
     },
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 2f401445f7e..c9c4ef879c3 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -410,10 +410,10 @@ instance.web.ActionManager = instance.web.Widget.extend({
             }
             this.dialog_stop(executor.action);
             this.dialog = new instance.web.Dialog(this, {
+                title: executor.action.name,
                 dialogClass: executor.klass,
             });
             this.dialog.on("closing", null, options.on_close);
-            this.dialog.dialog_title = executor.action.name;
             if (widget instanceof instance.web.ViewManager) {
                 _.extend(widget.flags, {
                     $buttons: this.dialog.$buttons,
@@ -1223,7 +1223,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
                 domain = $.Deferred().resolve(undefined);
             }
             if (ids.length === 0) {
-                instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
+                new instance.web.Dialog(this, { title: _t("Warning")}, $("<div />").text(_t("You must choose at least one record."))).open();
                 return false;
             }
             var active_ids_context = {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 3f7494c75fa..7a05a6524a3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -32,7 +32,20 @@
         <t t-esc="message"/>
     </div>
 </t>
-
+<t t-name="Dialog">
+    <div class="modal" tabindex="-1" data-backdrop="static" role="dialog" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                    <h3 class="modal-title"><t t-raw="title"/></h3>
+                </div>
+                <div class="modal-body">
+                </div>
+            </div>
+        </div>
+    </div>
+</t>
 <t t-name="CrashManager.warning">
     <table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning">
     <tr>
-- 
cgit v1.2.3


From 964e94f8a800661020af8082c719b19c4cdddd86 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 10 Apr 2014 14:11:22 +0200
Subject: [FIX]forgot to open a dialog

bzr revid: csn@openerp.com-20140410121122-y0a8l1hzd01af8bn
---
 addons/web/static/src/css/base.sass   | 4 ++--
 addons/web/static/src/js/chrome.js    | 2 +-
 addons/web/static/src/js/view_form.js | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 335e04f2424..fbf86cca678 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2719,8 +2719,8 @@ body.oe_single_form
             font-size: 20px
     .modal-footer
         text-align: left
-    &.oe_act_window
-        .modal-body
+    .oe_act_window
+        &.modal-body
             padding: 0
 
 input[type="radio"], input[type="checkbox"]
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index f9085af3854..4c4f750f76e 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -379,7 +379,7 @@ instance.web.RedirectWarningHandler = instance.web.Dialog.extend(instance.web.Ex
                     this.$el.parents('.modal').modal('hide');
                 }}
             ],
-        }, QWeb.render('CrashManager.warning', {error: error}));
+        }, QWeb.render('CrashManager.warning', {error: error})).open();
         this.destroy();
     }
 });
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 79bd078b6de..89e5d04fa75 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4965,7 +4965,6 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
                 });
             });
             var $cbutton = self.$buttonpane.find(".oe_abstractformpopup-form-close");
-            // $cbutton = $cbutton.add(self.$el.parents('.modal:first').find('.close')[0]);
             $cbutton.click(function() {
                 self.view_form.trigger('on_button_cancel');
                 self.check_exit();
-- 
cgit v1.2.3


From 049539809d4d1e4d37eac4b59d08d10c39c731f7 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 10 Apr 2014 17:19:40 +0200
Subject: [FIX]modal strict to bootstrap: no resize and only use 3 size,
 large-medium-small instead of changing width of modal

bzr revid: csn@openerp.com-20140410151940-w0m1ljjqgo0eysgp
---
 addons/web/static/src/css/base.css    |  3 --
 addons/web/static/src/css/base.sass   |  3 --
 addons/web/static/src/js/chrome.js    | 93 +++++++----------------------------
 addons/web/static/src/js/view_form.js |  4 +-
 addons/web/static/src/js/views.js     |  8 +--
 5 files changed, 25 insertions(+), 86 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 22bb7d41c66..ea66d600ac5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1091,9 +1091,6 @@
   margin-left: -6px;
 }
 .openerp .oe_about .oe_bottom {
-  position: absolute;
-  left: 0;
-  right: 0;
   text-shadow: 0 1px 1px #999999;
   background-color: #8a0e0e;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index fbf86cca678..f70fee5583f 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -931,9 +931,6 @@ $sheet-padding: 16px
         .oe_logo
             margin-left: -6px
         .oe_bottom
-            position: absolute
-            left: 0
-            right: 0
             text-shadow: 0 1px 1px #999999
             @include vertical-gradient(#b41616, #600606)
             color: #eee
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 4c4f750f76e..7c1cf198efe 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -71,6 +71,8 @@ instance.web.Dialog = instance.web.Widget.extend({
         @param {Widget} parent
         @param {dictionary} options A dictionary that will be forwarded to jQueryUI Dialog. Additionaly, that
             dictionary can contain the following keys:
+            - modal_size: one of the following: 'large', 'medium', 'small'
+            - dialogClass: class to add to the body of dialog
             - buttons: Deprecated. The buttons key is not propagated to jQueryUI Dialog. It must be a dictionary (key = button
                 label, value = click handler) or a list of dictionaries (each element in the dictionary is send to the
                 corresponding method of a jQuery element targeting the <button> tag). It is deprecated because all dialogs
@@ -87,13 +89,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         this.content_to_set = content;
         this.dialog_options = {
             destroy_on_close: true,
-            width: 900,
-            min_width: 0,
-            max_width: '95%',
-            height: 'auto',
-            min_height: 0,
-            max_height: $(window.top).height() - 200,
-            resizable: true,
+            modal_size: 'large', //'medium', 'small'
             buttons: null,
         };
         if (options) {
@@ -102,51 +98,6 @@ instance.web.Dialog = instance.web.Widget.extend({
         this.on("closing", this, this._closing);
         this.$buttons = $('<div class="modal-footer"><span class="oe_dialog_custom_buttons"/></div>');
     },
-    _get_options: function() {
-        var self = this;
-        var o = _.extend({}, this.dialog_options);
-        var sizes = {
-            width: $(window.top).width(),
-            height: $(window.top).height(),
-        };
-        _.each(sizes, function(available_size, unit) {
-            o[unit] = self._get_size(o[unit], available_size);
-            o['min_' + unit] = self._get_size(o['min_' + unit] || 0, available_size);
-            o['max_' + unit] = self._get_size(o['max_' + unit] || 0, available_size);
-            if (o[unit] !== 'auto' && o['min_' + unit] && o[unit] < o['min_' + unit]) {
-                o[unit] = o['min_' + unit];
-            }
-            if (o[unit] !== 'auto' && o['max_' + unit] && o[unit] > o['max_' + unit]) {
-                o[unit] = o['max_' + unit];
-            }
-        });
-        var layout_inner = {};
-        var layout_outer = {};
-        _.each(o, function(value,key){
-            if (_.contains(self.css_layout_inner, ''+key+'')){
-                layout_inner[key] = value;
-                delete o[key];
-            }
-            if (_.contains(self.css_layout_outer, ''+key+'')){
-                layout_outer[key] = value;
-                delete o[key];
-            }
-        });
-        o.layout_inner = layout_inner;
-        o.layout_outer = layout_outer;
-        o.title = o.title || this.dialog_title;
-        return o;
-    },
-    _get_size: function(val, available_size) {
-        val = val.toString();
-        if (val === 'auto') {
-            return val;
-        } else if (val.slice(-1) === "%") {
-            return Math.round(available_size / 100 * parseInt(val.slice(0, -1), 10));
-        } else {
-            return parseInt(val, 10);
-        }
-    },
     renderElement: function() {
         if (this.content_to_set) {
             this.setElement(this.content_to_set);
@@ -189,7 +140,8 @@ instance.web.Dialog = instance.web.Widget.extend({
     */
     init_dialog: function() {
         var self = this;
-        var options = this._get_options();
+        var options = _.extend({}, this.dialog_options);
+        options.title = options.title || this.dialog_title;
         if (options.buttons) {
             this._add_buttons(options.buttons);
             delete(options.buttons);
@@ -201,36 +153,26 @@ instance.web.Dialog = instance.web.Widget.extend({
             'backdrop': false,
             'keyboard': true,
         });
+        if (options.modal_size !== 'large'){
+            var dialog_class_size = this.$dialog_box.find('.modal-lg').removeClass('modal-lg')
+            if (options.modal_size === 'small'){
+                dialog_class_size.addClass('modal-sm');
+            }
+        }
+
         this.$el.appendTo(this.$dialog_box.find(".modal-body"));
         var dialog_body = this.$dialog_box.find('.modal-content');
-        if (options.layout_outer || options.layout_inner){
-            dialog_body.parent().css(options.layout_outer);
-            dialog_body.css(options.layout_inner);
-        }
         if (options.dialogClass){
             dialog_body.find(".modal-body").addClass(options.dialogClass);
         }
         dialog_body.openerpClass();
         dialog_body.draggable({ handle: ".modal-header", containment: "window" });
+
         this.$dialog_box.on('hidden.bs.modal',this,function(){
             self.trigger("closing");
         });
         this.$dialog_box.modal('show');
 
-        if (options.layout_inner.height === 'auto' && options.layout_inner.max_height) {
-            this.$el.css({ 'max-height': options.layout_inner.max_height, 'overflow-y': 'auto' });
-        }
-        var dialog_body = this.$dialog_box.find('.modal-content');
-        if (options.resizable){
-            dialog_body.resizable({ handles: 'n, e, s, w, ne, se, sw, nw' });
-        }
-        dialog_body.resize(function() {
-            var main_modal = dialog_body.parent();
-            var modal_body = main_modal.find(".modal-body .in");
-            var modal_content = main_modal.find(".modal-content").height();
-            modal_body.height(modal_content - 150);
-            main_modal.find(".modal-content").height((modal_body.height() + main_modal.find(".modal-header").height() + main_modal.find(".modal-footer").height()) + 85);
-        });
         this.dialog_inited = true;
         var res = this.start();
         return res;
@@ -305,6 +247,7 @@ instance.web.CrashManager = instance.web.Class.extend({
             error = _.extend({}, error, {data: _.extend({}, error.data, {message: error.data.arguments[0] + "\n\n" + error.data.arguments[1]})});
         }
         new instance.web.Dialog(this, {
+            modal_size: 'medium',
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
                 {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
@@ -321,7 +264,6 @@ instance.web.CrashManager = instance.web.Class.extend({
         };
         new instance.web.Dialog(this, {
             title: "OpenERP " + _.str.capitalize(error.type),
-            width: '80%',
             buttons: buttons
         }, QWeb.render('CrashManager.error', {session: instance.session, error: error})).open();
     },
@@ -371,6 +313,7 @@ instance.web.RedirectWarningHandler = instance.web.Dialog.extend(instance.web.Ex
         error.data.message = error.data.arguments[0];
 
         new instance.web.Dialog(this, {
+            modal_size: 'medium',
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
                 {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }},
@@ -527,6 +470,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
      */
     display_error: function (error) {
         return new instance.web.Dialog(this, {
+            modal_size: 'medium',
             title: error.title,
             buttons: [
                 {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
@@ -759,6 +703,7 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
     },
     display_error: function (error) {
         return new instance.web.Dialog(this, {
+            modal_size: 'medium',
             title: error.title,
             buttons: [
                 {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
@@ -1079,9 +1024,9 @@ instance.web.UserMenu =  instance.web.Widget.extend({
                 window.location = $.param.querystring( window.location.href, 'debug');
             });
             new instance.web.Dialog(this, {
-                resizable: false,
+                modal_size: 'medium',
+                dialogClass: 'oe_act_window',
                 title: _t("About"),
-                width: 507, height: 290,
             }, $help).open();
         });
     },
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 89e5d04fa75..3dfe4f6f324 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -587,6 +587,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         if (!_.isEmpty(result.warning)) {
             new instance.web.Dialog(this, {
+                modal_size: 'medium',
                 title:result.warning.title,
                 buttons: [
                     {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
@@ -3229,7 +3230,7 @@ instance.web.form.M2ODialog = instance.web.Dialog.extend({
     init: function(parent) {
         this._super(parent, {
             title: _.str.sprintf(_t("Add %s"), parent.string),
-            width: 312,
+            modal_size: 'medium',
         });
     },
     start: function() {
@@ -4912,7 +4913,6 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
         var self = this;
         this.renderElement();
         var dialog = new instance.web.Dialog(this, {
-            min_width: '800px',
             dialogClass: 'oe_act_window',
             title: this.options.title || "",
         }, this.$el).open();
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index c9c4ef879c3..362740e9ebb 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -926,7 +926,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
             current_view = this.views[this.active_view].controller;
         switch (val) {
             case 'fvg':
-                var dialog = new instance.web.Dialog(this, { title: _t("Fields View Get"), width: '95%' }).open();
+                var dialog = new instance.web.Dialog(this, { title: _t("Fields View Get") }).open();
                 $('<pre>').text(instance.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$el);
                 break;
             case 'tests':
@@ -943,7 +943,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
                     this.dataset.call('perm_read', [ids]).done(function(result) {
                         var dialog = new instance.web.Dialog(this, {
                             title: _.str.sprintf(_t("View Log (%s)"), self.dataset.model),
-                            width: 400
+                            modal_size: 'medium',
                         }, QWeb.render('ViewManagerDebugViewLog', {
                             perm : result[0],
                             format : instance.web.format_value
@@ -986,7 +986,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
                     new instance.web.Dialog(self, {
                         title: _.str.sprintf(_t("Model %s fields"),
                                              self.dataset.model),
-                        width: '95%'}, $root).open();
+                        }, $root).open();
                 });
                 break;
             case 'edit_workflow':
@@ -1223,7 +1223,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
                 domain = $.Deferred().resolve(undefined);
             }
             if (ids.length === 0) {
-                new instance.web.Dialog(this, { title: _t("Warning")}, $("<div />").text(_t("You must choose at least one record."))).open();
+                new instance.web.Dialog(this, { title: _t("Warning"), modal_size: 'medium',}, $("<div />").text(_t("You must choose at least one record."))).open();
                 return false;
             }
             var active_ids_context = {
-- 
cgit v1.2.3


From 09cd7585e2899e6422e5a452d9ee79b44e0c77da Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 10 Apr 2014 17:45:20 +0200
Subject: [FIX]remove draggable on modal window + clean up

bzr revid: csn@openerp.com-20140410154520-h7790rxb8h2hx2zx
---
 addons/web/static/src/js/chrome.js | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 7c1cf198efe..f49d9e4d5b1 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -83,8 +83,6 @@ instance.web.Dialog = instance.web.Widget.extend({
     */
     init: function (parent, options, content) {
         var self = this;
-        this.css_layout_outer = ['width','min_width','max_width'];
-        this.css_layout_inner = ['height','min_height','max_height'];
         this._super(parent);
         this.content_to_set = content;
         this.dialog_options = {
@@ -166,7 +164,6 @@ instance.web.Dialog = instance.web.Widget.extend({
             dialog_body.find(".modal-body").addClass(options.dialogClass);
         }
         dialog_body.openerpClass();
-        dialog_body.draggable({ handle: ".modal-header", containment: "window" });
 
         this.$dialog_box.on('hidden.bs.modal',this,function(){
             self.trigger("closing");
-- 
cgit v1.2.3


From c8607c8b818b4554c01294f5c05bc5d20f226f82 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Fri, 11 Apr 2014 14:27:53 +0200
Subject: [FIX]few cosmetic of code

bzr revid: csn@openerp.com-20140411122753-qzxb29uwkw89mrxs
---
 addons/web/static/src/css/base.sass   | 18 ++++++++----------
 addons/web/static/src/js/chrome.js    | 26 +++++++++++++-------------
 addons/web/static/src/js/view_form.js |  4 ++--
 addons/web/static/src/js/views.js     |  4 ++--
 4 files changed, 25 insertions(+), 27 deletions(-)

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

diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f70fee5583f..882d0489c04 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2707,18 +2707,16 @@ body.oe_single_form
 
 // Customized modal according bootstrap3
 .modal
-    .modal-header
-        button.close
-            border: none
-            background: none
-            padding: 1px
-            height: 18px
-            font-size: 20px
+    .modal-header button.close
+        border: none
+        background: none
+        padding: 1px
+        height: 18px
+        font-size: 20px
     .modal-footer
         text-align: left
-    .oe_act_window
-        &.modal-body
-            padding: 0
+    .oe_act_window.modal-body
+        padding: 0
 
 input[type="radio"], input[type="checkbox"]
     margin-right: 4px
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index f49d9e4d5b1..ee88839e656 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -71,7 +71,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         @param {Widget} parent
         @param {dictionary} options A dictionary that will be forwarded to jQueryUI Dialog. Additionaly, that
             dictionary can contain the following keys:
-            - modal_size: one of the following: 'large', 'medium', 'small'
+            - size: one of the following: 'large', 'medium', 'small'
             - dialogClass: class to add to the body of dialog
             - buttons: Deprecated. The buttons key is not propagated to jQueryUI Dialog. It must be a dictionary (key = button
                 label, value = click handler) or a list of dictionaries (each element in the dictionary is send to the
@@ -87,7 +87,7 @@ instance.web.Dialog = instance.web.Widget.extend({
         this.content_to_set = content;
         this.dialog_options = {
             destroy_on_close: true,
-            modal_size: 'large', //'medium', 'small'
+            size: 'large', //'medium', 'small'
             buttons: null,
         };
         if (options) {
@@ -151,21 +151,21 @@ instance.web.Dialog = instance.web.Widget.extend({
             'backdrop': false,
             'keyboard': true,
         });
-        if (options.modal_size !== 'large'){
+        if (options.size !== 'large'){
             var dialog_class_size = this.$dialog_box.find('.modal-lg').removeClass('modal-lg')
-            if (options.modal_size === 'small'){
+            if (options.size === 'small'){
                 dialog_class_size.addClass('modal-sm');
             }
         }
 
         this.$el.appendTo(this.$dialog_box.find(".modal-body"));
-        var dialog_body = this.$dialog_box.find('.modal-content');
+        var $dialog_content = this.$dialog_box.find('.modal-content');
         if (options.dialogClass){
-            dialog_body.find(".modal-body").addClass(options.dialogClass);
+            $dialog_content.find(".modal-body").addClass(options.dialogClass);
         }
-        dialog_body.openerpClass();
+        $dialog_content.openerpClass();
 
-        this.$dialog_box.on('hidden.bs.modal',this,function(){
+        this.$dialog_box.on('hidden.bs.modal', this, function(){
             self.trigger("closing");
         });
         this.$dialog_box.modal('show');
@@ -244,7 +244,7 @@ instance.web.CrashManager = instance.web.Class.extend({
             error = _.extend({}, error, {data: _.extend({}, error.data, {message: error.data.arguments[0] + "\n\n" + error.data.arguments[1]})});
         }
         new instance.web.Dialog(this, {
-            modal_size: 'medium',
+            size: 'medium',
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
                 {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
@@ -310,7 +310,7 @@ instance.web.RedirectWarningHandler = instance.web.Dialog.extend(instance.web.Ex
         error.data.message = error.data.arguments[0];
 
         new instance.web.Dialog(this, {
-            modal_size: 'medium',
+            size: 'medium',
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
                 {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }},
@@ -467,7 +467,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
      */
     display_error: function (error) {
         return new instance.web.Dialog(this, {
-            modal_size: 'medium',
+            size: 'medium',
             title: error.title,
             buttons: [
                 {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
@@ -700,7 +700,7 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
     },
     display_error: function (error) {
         return new instance.web.Dialog(this, {
-            modal_size: 'medium',
+            size: 'medium',
             title: error.title,
             buttons: [
                 {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
@@ -1021,7 +1021,7 @@ instance.web.UserMenu =  instance.web.Widget.extend({
                 window.location = $.param.querystring( window.location.href, 'debug');
             });
             new instance.web.Dialog(this, {
-                modal_size: 'medium',
+                size: 'medium',
                 dialogClass: 'oe_act_window',
                 title: _t("About"),
             }, $help).open();
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 3dfe4f6f324..87a7114473e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -587,7 +587,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
         }
         if (!_.isEmpty(result.warning)) {
             new instance.web.Dialog(this, {
-                modal_size: 'medium',
+                size: 'medium',
                 title:result.warning.title,
                 buttons: [
                     {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
@@ -3230,7 +3230,7 @@ instance.web.form.M2ODialog = instance.web.Dialog.extend({
     init: function(parent) {
         this._super(parent, {
             title: _.str.sprintf(_t("Add %s"), parent.string),
-            modal_size: 'medium',
+            size: 'medium',
         });
     },
     start: function() {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 362740e9ebb..dc9f706d40e 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -943,7 +943,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
                     this.dataset.call('perm_read', [ids]).done(function(result) {
                         var dialog = new instance.web.Dialog(this, {
                             title: _.str.sprintf(_t("View Log (%s)"), self.dataset.model),
-                            modal_size: 'medium',
+                            size: 'medium',
                         }, QWeb.render('ViewManagerDebugViewLog', {
                             perm : result[0],
                             format : instance.web.format_value
@@ -1223,7 +1223,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
                 domain = $.Deferred().resolve(undefined);
             }
             if (ids.length === 0) {
-                new instance.web.Dialog(this, { title: _t("Warning"), modal_size: 'medium',}, $("<div />").text(_t("You must choose at least one record."))).open();
+                new instance.web.Dialog(this, { title: _t("Warning"), size: 'medium',}, $("<div />").text(_t("You must choose at least one record."))).open();
                 return false;
             }
             var active_ids_context = {
-- 
cgit v1.2.3


From 6b020549f8e9e12acd0385e4dd0708137042bf20 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 14 Apr 2014 16:06:52 +0200
Subject: [FIX]modal windows: when pressing esc key, modal-backdrop was not
 removed

bzr revid: csn@openerp.com-20140414140652-g06gl0mguyhta5px
---
 addons/web/static/src/js/chrome.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ee88839e656..b3fbb35134b 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -196,6 +196,7 @@ instance.web.Dialog = instance.web.Widget.extend({
     */
     destroy: function (reason) {
         this.$buttons.remove();
+        var self = this;
         _.each(this.getChildren(), function(el) {
             el.destroy();
         });
@@ -205,7 +206,12 @@ instance.web.Dialog = instance.web.Widget.extend({
             this.__tmp_dialog_destroying = undefined;
         }
         if (this.dialog_inited && !this.isDestroyed() && this.$el.is(":data(bs.modal)")) {
-            this.$el.parents('.modal').remove();
+            //we need this to put the instruction to remove modal from DOM at the end
+            //of the queue, otherwise it might already have been removed before the modal-backdrop
+            //is removed when pressing escape key
+            setTimeout(function () {
+                self.$el.parents('.modal').remove();
+            },0);
         }
         this._super();
     }
-- 
cgit v1.2.3


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: [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(-)

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

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
-- 
cgit v1.2.3


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: [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(-)

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

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
-- 
cgit v1.2.3


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: [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(+)

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

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"/>
-- 
cgit v1.2.3


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: [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(-)

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

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;
-- 
cgit v1.2.3


From 91930b470d000b863511b841b40d42c9ce1b0c98 Mon Sep 17 00:00:00 2001
From: Mohammed Shekha <msh@tinyerp.com>
Date: Wed, 16 Apr 2014 14:08:57 +0530
Subject: [FIX]Fixed the issue of reference field throws traceback that view is
 undefined, the reason is that reference field passing DefaultFieldManager
 while creating instance of many2one widget and DefaultFieldManager is
 eventually extending instance.web.widget not instance.web.form.FormWidget and
 hence DefaultFieldmanager will nto having view attribute, instead of calling
 self.view.do_onchange, trigger changed_value which is going to do the same
 job.

bzr revid: msh@tinyerp.com-20140416083857-sug0k4a28nkvgg27
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index edb44e7ea06..11e2c4e6b7c 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3148,7 +3148,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 self.display_value = {};
                 self.render_value();
                 self.focus();
-                self.view.do_onchange(self);
+                self.trigger('changed_value');
             });
         });
 
-- 
cgit v1.2.3


From b7f3808824d7da5f2c3cc1c39a0fa5c66764592f Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 16 Apr 2014 14:00:34 +0200
Subject: [FIX]modal not correctly destroying from DOM at exit

bzr revid: csn@openerp.com-20140416120034-sps3a7dc2mgpwfzt
---
 addons/web/static/src/js/chrome.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 4456080ee51..fca55957fd7 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -212,8 +212,9 @@ instance.web.Dialog = instance.web.Widget.extend({
             //we need this to put the instruction to remove modal from DOM at the end
             //of the queue, otherwise it might already have been removed before the modal-backdrop
             //is removed when pressing escape key
+            var $parent = this.$el.parents('.modal');
             setTimeout(function () {
-                self.$el.parents('.modal').remove();
+                $parent.remove();
             },0);
         }
         this._super();
-- 
cgit v1.2.3


From cbd17e3a9f70943c7dc922ff5fbc60f2dcf8048a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 16 Apr 2014 15:34:02 +0200
Subject: [FIX] char_domain widget: better use of options to compute the model
 in which we want to select records.

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

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 33845ec8ed5..dc751b56ced 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2464,9 +2464,9 @@ instance.web.form.FieldCharDomain = instance.web.form.AbstractField.extend(insta
         var self = this;
         this.$el.html(instance.web.qweb.render("FieldCharDomain", {widget: this}));
         if (this.get('value')) {
+            var model = this.options.model || this.field_manager.get_field_value(this.options.model_field);
             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());
+            var ds = new instance.web.DataSetStatic(self, model, 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');
-- 
cgit v1.2.3


From ecd96fc0a69c6eda79886a2ae3ef505966ee5165 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 16 Apr 2014 16:35:48 +0200
Subject: [ADD] web: in view form, when opening a many2one, use
 get_formview_action method of orm to get the window action to open

bzr revid: dle@openerp.com-20140416143548-i5l6kl00ixgd9x4w
---
 addons/web/static/src/js/view_form.js | 44 ++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 21 deletions(-)

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index dc751b56ced..f1323d01382 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3451,20 +3451,25 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 return;
             }
             var pop = new instance.web.form.FormOpenPopup(self);
-            pop.show_element(
-                self.field.relation,
-                self.get("value"),
-                self.build_context(),
-                {
-                    title: _t("Open: ") + self.string
-                }
-            );
-            pop.on('write_completed', self, function(){
-                self.display_value = {};
-                self.display_value_backup = {};
-                self.render_value();
-                self.focus();
-                self.view.do_onchange(self);
+            var context = self.build_context().eval();
+            var model_obj = new instance.web.Model(self.field.relation);
+            model_obj.call('get_formview_id', [self.get("value"), context]).then(function(view_id){
+                pop.show_element(
+                    self.field.relation,
+                    self.get("value"),
+                    self.build_context(),
+                    {
+                        title: _t("Open: ") + self.string,
+                        view_id: view_id
+                    }
+                );
+                pop.on('write_completed', self, function(){
+                    self.display_value = {};
+                    self.display_value_backup = {};
+                    self.render_value();
+                    self.focus();
+                    self.view.do_onchange(self);
+                });
             });
         });
 
@@ -3660,13 +3665,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                  .html(link);
             if (! this.options.no_open)
                 $link.click(function () {
-                    self.do_action({
-                        type: 'ir.actions.act_window',
-                        res_model: self.field.relation,
-                        res_id: self.get("value"),
-                        views: [[false, 'form']],
-                        target: 'current',
-                        context: self.build_context().eval(),
+                    var context = self.build_context().eval();
+                    var model_obj = new instance.web.Model(self.field.relation);
+                    model_obj.call('get_formview_action', [self.get("value"), context]).then(function(action){
+                        self.do_action(action);
                     });
                     return false;
                  });
-- 
cgit v1.2.3


From 7990c39127bf7204769ae93a257b00c583a221ac Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 16 Apr 2014 17:15:43 +0200
Subject: [FIX]modal: button were not showing in calendar

bzr revid: csn@openerp.com-20140416151543-im41f9rpqj6ll742
---
 addons/web/static/src/css/base.css    | 3 +++
 addons/web/static/src/css/base.sass   | 2 ++
 addons/web/static/src/js/view_form.js | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 9ddcf9ca872..b8c28e1660e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3344,6 +3344,9 @@ body.oe_single_form .oe_single_form_container {
 .modal .oe_act_window.modal-body{
   padding: 0;
 }
+.modal .oe_button{
+  margin: 0 4px 0 0;
+}
 input[type="radio"], input[type="checkbox"] {
   margin-right: 4px;
   margin-left: 4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d3153ee5d62..a98948117f6 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2720,6 +2720,8 @@ body.oe_single_form
         font-size: 20px
     .modal-footer
         text-align: left
+    .oe_button
+        margin: 0 4px 0 0
     .oe_act_window.modal-body
         padding: 0
 
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f1323d01382..0ecd164a5e1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1958,7 +1958,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
         var exec_action = function() {
             if (self.node.attrs.confirm) {
                 var def = $.Deferred();
-                var dialog = instance.web.Dialog(this, {
+                var dialog = new instance.web.Dialog(this, {
                     title: _t('Confirm'),
                     buttons: [
                         {text: _t("Cancel"), click: function() {
-- 
cgit v1.2.3


From 347985e050a7163781a81e3344a130ffaa520e14 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 17 Apr 2014 10:59:54 +0200
Subject: [FIX]tooltip: overwrite bootstrap default for tooltip

bzr revid: csn@openerp.com-20140417085954-mirh4eeotsorlyeo
---
 addons/web/static/src/js/chrome.js    | 2 +-
 addons/web/static/src/js/core.js      | 5 +++++
 addons/web/static/src/js/view_form.js | 2 --
 addons/web/static/src/js/views.js     | 7 +------
 4 files changed, 7 insertions(+), 9 deletions(-)

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

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 52d789a34f0..0d73aea5d35 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1076,7 +1076,7 @@ instance.web.Client = instance.web.Widget.extend({
     bind_events: function() {
         var self = this;
         this.$el.on('mouseenter', '.oe_systray > div:not([data-toggle=tooltip])', function() {
-            $(this).attr('data-toggle', 'tooltip').tooltip({placement: 'bottom', html: true}).trigger('mouseenter');
+            $(this).attr('data-toggle', 'tooltip').tooltip().trigger('mouseenter');
         });
         this.$el.on('click', '.oe_dropdown_toggle', function(ev) {
             ev.preventDefault();
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 90c84ba9cda..6a234058333 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -788,6 +788,11 @@ instance.web.unblockUI = function() {
     return $.unblockUI.apply($, arguments);
 };
 
+
+/* Bootstrap defaults overwrite */
+$.fn.tooltip.Constructor.DEFAULTS.placement = 'auto top';
+$.fn.tooltip.Constructor.DEFAULTS.html = true;
+
 /**
  * Registry for all the client actions key: tag value: widget
  */
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 25d83105642..3787678d7dd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1876,8 +1876,6 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
                         widget: widget
                     });
                 },
-                placement: "auto top",
-                html: true,
             }, options || {});
         $(trigger).tooltip(options);
     },
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 7c98e324917..b9015f6b311 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -581,10 +581,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         var self = this;
         this.$el.find('.oe_view_manager_switch a').click(function() {
             self.switch_mode($(this).data('view-type'));
-        }).tooltip({
-            placement: 'bottom',
-            html: true,
-        });
+        }).tooltip();
         var views_ids = {};
         _.each(this.views_src, function(view) {
             self.views[view.view_type] = $.extend({}, view, {
@@ -1161,8 +1158,6 @@ instance.web.Sidebar = instance.web.Widget.extend({
             $(this).toggle(!!$(this).find('li').length);
         });
         self.$("[title]").tooltip({
-            html: true,
-            placement: 'bottom',
             delay: { show: 500, hide: 0}
         });
     },
-- 
cgit v1.2.3


From 336fba01e50d20cd29fa820b3db61a3a0c30a299 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 17 Apr 2014 11:59:44 +0200
Subject: [FIX]tooltip: should not use placement auto since it is currently
 bugged in bootstrap (see: https://github.com/twbs/bootstrap/issues/13268)

bzr revid: csn@openerp.com-20140417095944-3k2c8829tm6lmxmo
---
 addons/web/static/src/js/core.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 6a234058333..5339fa80615 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -790,7 +790,7 @@ instance.web.unblockUI = function() {
 
 
 /* Bootstrap defaults overwrite */
-$.fn.tooltip.Constructor.DEFAULTS.placement = 'auto top';
+$.fn.tooltip.Constructor.DEFAULTS.placement = 'bottom';
 $.fn.tooltip.Constructor.DEFAULTS.html = true;
 
 /**
-- 
cgit v1.2.3


From f928ba4f10207c39e02cbecfe8af81350445ad2d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 17 Apr 2014 12:10:00 +0200
Subject: [FIX] web: double click on save button was trying to save the data
 two times if there is some latency

bzr revid: dle@openerp.com-20140417101000-6gtyxntkm5d7zcoy
---
 addons/web/static/src/js/view_form.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c5cc4989d4a..debda6348fa 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -719,8 +719,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             }
         }
     },
-    on_button_save: function() {
+    on_button_save: function(e) {
         var self = this;
+        $(e.delegateTarget).attr("disabled", true);
         return this.save().done(function(result) {
             self.trigger("save", result);
             self.reload().then(function() {
@@ -730,6 +731,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                     parent.menu.do_reload_needaction();
                 }
             });
+        }).always(function(){
+            $(e.delegateTarget).attr("disabled", false);
         });
     },
     on_button_cancel: function(event) {
-- 
cgit v1.2.3


From 7c668d8eac0f5c8ffddc7c6836e45ab821768d26 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 17 Apr 2014 12:12:17 +0200
Subject: [FIX] web: double click on save button was trying to save the data
 two times if there is some latency, event target should be used instead of
 delegate target

bzr revid: dle@openerp.com-20140417101217-3fwnm76qne6f1vwk
---
 addons/web/static/src/js/view_form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index debda6348fa..d09cfb59ab0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -721,7 +721,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     },
     on_button_save: function(e) {
         var self = this;
-        $(e.delegateTarget).attr("disabled", true);
+        $(e.target).attr("disabled", true);
         return this.save().done(function(result) {
             self.trigger("save", result);
             self.reload().then(function() {
@@ -732,7 +732,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 }
             });
         }).always(function(){
-            $(e.delegateTarget).attr("disabled", false);
+            $(e.target).attr("disabled", false);
         });
     },
     on_button_cancel: function(event) {
-- 
cgit v1.2.3


From 4aec292e5cc5d96ccb4786a017905571a1131af7 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 17 Apr 2014 16:04:52 +0200
Subject: [FIX]tooltip: when not in debug mode, display tooltip in form view
 with bootstrat as well

bzr revid: csn@openerp.com-20140417140452-afqwxqv8pbvpbs3m
---
 addons/web/static/src/js/view_form.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 03b21febc78..6212cc3d549 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1880,7 +1880,11 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
                     });
                 },
             }, options || {});
-        $(trigger).tooltip(options);
+        //only show tooltip if we are in debug or if we have a help to show, otherwise it will display
+        //as empty
+        if (instance.session.debug || widget.node.attrs.help || (widget.field && widget.field.help)){
+            $(trigger).tooltip(options);
+        }
     },
     /**
      * Builds a new context usable for operations related to fields by merging
@@ -2117,8 +2121,8 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
             this.$el.find('.oe_field_translate').click(this.on_translate);
         }
         this.$label = this.view ? this.view.$el.find('label[for=' + this.id_for_label + ']') : $();
+        this.do_attach_tooltip(this, this.$label[0] || this.$el);
         if (instance.session.debug) {
-            this.do_attach_tooltip(this, this.$label[0] || this.$el);
             this.$label.off('dblclick').on('dblclick', function() {
                 console.log("Field '%s' of type '%s' in View: %o", self.name, (self.node.attrs.widget || self.field.type), self.view);
                 window.w = self;
-- 
cgit v1.2.3


From d535196bb62b6df6aa543afcaf9a8fa0c0cc17ac Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Fri, 18 Apr 2014 12:12:35 +0200
Subject: [FIX]pretty tooltip: attach tooltip to body to insure that some
 element don't move over the place. increase tooltip z-index to be visible
 when a modal is open

bzr revid: csn@openerp.com-20140418101235-08yqheh70wi4hb6g
---
 addons/web/static/src/css/base.css | 2 ++
 addons/web/static/src/js/core.js   | 1 +
 2 files changed, 3 insertions(+)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 023c80877ef..4931ec103be 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3307,6 +3307,8 @@ body.oe_single_form .oe_single_form_container {
   background: white;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   background-color: transparent;
+  /*We need a greater z-index in order for tooltip to go over bootstrap modal z-index*/
+  z-index: 1500;
 }
 .tooltip .tooltip-inner {
   text-align: left !important;
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 5339fa80615..acb4c2b4996 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -792,6 +792,7 @@ instance.web.unblockUI = function() {
 /* Bootstrap defaults overwrite */
 $.fn.tooltip.Constructor.DEFAULTS.placement = 'bottom';
 $.fn.tooltip.Constructor.DEFAULTS.html = true;
+$.fn.tooltip.Constructor.DEFAULTS.container = 'body';
 
 /**
  * Registry for all the client actions key: tag value: widget
-- 
cgit v1.2.3


From 6083ed4b46dab046fe4e21bdb479afb7cd1d3216 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 22 Apr 2014 17:09:18 +0200
Subject: [FIX] web: abitility to do exact id matching with child_of operator
 for searchs on many2one fields

bzr revid: dle@openerp.com-20140422150918-nxv2v4bcvi6u3v6g
---
 addons/web/static/src/js/search.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index b82ad6504a9..1f616202c3f 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1578,8 +1578,11 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
         return facetValue.get('label');
     },
     make_domain: function (name, operator, facetValue) {
-        if (operator === this.default_operator) {
+        switch(operator){
+        case this.default_operator:
             return [[name, '=', facetValue.get('value')]];
+        case 'child_of':
+            return [[name, 'child_of', facetValue.get('value')]];
         }
         return this._super(name, operator, facetValue);
     },
-- 
cgit v1.2.3


From 115c586e0a3c9fb394b875890ae929e9fae066d2 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Fri, 18 Apr 2014 17:25:11 +0200
Subject: [FIX]tooltip: fix bootstrap bug when using auto placement and element
 was removed before the tooltip actually show resulting in an error

bzr revid: csn@openerp.com-20140418152511-f11mzqefa791vgl2
---
 addons/web/static/src/js/core.js      | 12 +++++++++++-
 addons/web/static/src/js/view_form.js |  8 ++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

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

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index acb4c2b4996..a4bcd1922de 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -790,9 +790,19 @@ instance.web.unblockUI = function() {
 
 
 /* Bootstrap defaults overwrite */
-$.fn.tooltip.Constructor.DEFAULTS.placement = 'bottom';
+$.fn.tooltip.Constructor.DEFAULTS.placement = 'auto top';
 $.fn.tooltip.Constructor.DEFAULTS.html = true;
 $.fn.tooltip.Constructor.DEFAULTS.container = 'body';
+//overwrite bootstrap tooltip method to fix bug when using placement
+//auto and the parent element does not exist anymore resulting in
+//an error. This should be remove once bootstrap fix the bug
+var bootstrap_show_function = $.fn.tooltip.Constructor.prototype.show;
+$.fn.tooltip.Constructor.prototype.show = function (e) {
+    if (this.$element.parent().length === 0){
+        return;
+    }
+    return bootstrap_show_function.call(this, e);
+};
 
 /**
  * Registry for all the client actions key: tag value: widget
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6212cc3d549..aabaf0ad827 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1866,9 +1866,17 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
     do_attach_tooltip: function(widget, trigger, options) {
         widget = widget || this;
         trigger = trigger || this.$el;
+        var container = 'body';
+        //in the case we have a modal currently showing, attach tooltip
+        //to the modal to prevent the tooltip to show in the body in the
+        //case we close the modal too fast
+        if (window.$('.modal.in').length>0){
+            container = window.$('.modal.in:last()');
+        }
         options = _.extend({
                 delay: { show: 500, hide: 0 },
                 trigger: 'hover',
+                container: container,
                 title: function() {
                     var template = widget.template + '.tooltip';
                     if (!QWeb.has_template(template)) {
-- 
cgit v1.2.3


From 8ee8b7bde68a550e2950df75754ad387c8ae13b1 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 23 Apr 2014 11:14:14 +0200
Subject: [FIX]problem with header dropdown buttons css

bzr revid: csn@openerp.com-20140423091414-llv3t70gi59orbh0
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 4931ec103be..916e4ffe9ba 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1890,7 +1890,7 @@
 .openerp .oe_form > :not(.oe_form_nosheet) header {
   padding-left: 2px;
 }
-.openerp .oe_form > :not(.oe_form_nosheet) header ul:not(.oe_tooltip_technical) {
+.openerp .oe_form > :not(.oe_form_nosheet) header ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu) {
   display: inline-block;
   float: right;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 84758c062cb..d83b09bc897 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1550,7 +1550,7 @@ $sheet-padding: 16px
     // FormView.header {{{
     .oe_form > :not(.oe_form_nosheet) header
         padding-left: 2px
-        ul:not(.oe_tooltip_technical)
+        ul:not(.oe_tooltip_technical):not(.oe_dropdown_menu)
             display: inline-block
             float: right
         .oe_button
-- 
cgit v1.2.3