[IMP] web, web_*, mail, board : New modals and dialogs

6 files changed, 14 insertions, 20 deletions

diff --git a/addons/web/static/src/js/widgets/change_password.js b/addons/web/static/src/js/widgets/change_password.js
index 0ddfb20c4df..cded9dc9a4d 100644
--- a/addons/web/static/src/js/widgets/change_password.js
+++ b/addons/web/static/src/js/widgets/change_password.js
@@ -7,11 +7,11 @@ var Widget = require('web.Widget');
 
 var _t = core._t;
 
-var ChangePassword = Widget.extend({
+var ChangePassword = Widget.extend({ // FIXME
     template: "ChangePassword",
     start: function() {
         var self = this;
-        this.getParent().dialog_title = _t("Change Password");
+        this.getParent().set_title(_t("Change Password"));
         var $button = self.$el.find('.oe_form_button');
         $button.appendTo(this.getParent().$buttons);
         $button.eq(2).click(function(){
@@ -34,10 +34,8 @@ var ChangePassword = Widget.extend({
         return new Dialog(this, {
             size: 'medium',
             title: error.title,
-            buttons: [
-                {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
-            ]
-        }, $('<div>').html(error.error)).open();
+            $content: $('<div>').html(error.error)
+        }).open();
     },
 });
 
diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js
index 946862d7102..57159732ad6 100644
--- a/addons/web/static/src/js/widgets/data_export.js
+++ b/addons/web/static/src/js/widgets/data_export.js
@@ -12,7 +12,6 @@ var _t = core._t;
 
 var DataExport = Dialog.extend({
     template: 'ExportTreeView',
-    dialog_title: {toString: function () { return _t("Export Data"); }},
     events: {
         'click #add_field': function () {
             var self = this;
@@ -48,6 +47,7 @@ var DataExport = Dialog.extend({
         this.dataset = dataset;
         this.exports = new data.DataSetSearch(
             this, 'ir.exports', this.dataset.get_context());
+        this.set_title(_t("Export Data"));
     },
     start: function() {
         var self = this;
diff --git a/addons/web/static/src/js/widgets/database_manager.js b/addons/web/static/src/js/widgets/database_manager.js
index 180d42b59b6..cbffa5117dc 100644
--- a/addons/web/static/src/js/widgets/database_manager.js
+++ b/addons/web/static/src/js/widgets/database_manager.js
@@ -99,10 +99,8 @@ var DataBaseManager = Widget.extend({
         return new Dialog(this, {
             size: 'medium',
             title: error.title,
-            buttons: [
-                {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
-            ]
-        }, $('<div>').html(error.error)).open();
+            $content: $('<div>').html(error.error)
+        }).open();
     },
     do_create: function(form) {
         var fields = $(form).serializeArray();
diff --git a/addons/web/static/src/js/widgets/debug_manager.js b/addons/web/static/src/js/widgets/debug_manager.js
index 01db3ff71ef..b529e155fd9 100644
--- a/addons/web/static/src/js/widgets/debug_manager.js
+++ b/addons/web/static/src/js/widgets/debug_manager.js
@@ -131,12 +131,9 @@ if (core.debug) {
                     });
                 });
                 new Dialog(self, {
-                    title: _.str.sprintf(_t("Model %s fields"),
-                                         self.dataset.model),
-                    buttons: {
-                        Ok: function() { this.parents('.modal').modal('hide');}
-                    },
-                }, $root).open();
+                    title: _.str.sprintf(_t("Model %s fields"), self.dataset.model),
+                    $content: $root
+                }).open();
             });
         },
         fvg: function() {
diff --git a/addons/web/static/src/js/widgets/sidebar.js b/addons/web/static/src/js/widgets/sidebar.js
index 5dc6c147f39..9f7c46bf48d 100644
--- a/addons/web/static/src/js/widgets/sidebar.js
+++ b/addons/web/static/src/js/widgets/sidebar.js
@@ -121,7 +121,7 @@ var Sidebar = Widget.extend({
                 domain = $.Deferred().resolve(undefined);
             }
             if (ids.length === 0) {
-                new Dialog(this, { title: _t("Warning"), size: 'medium',}, $("<div />").text(_t("You must choose at least one record."))).open();
+                new Dialog(this, {title: _t("Warning"), size: 'medium', $content: $("<div/>").html(_t("You must choose at least one record."))}).open();
                 return false;
             }
             var dataset = self.getParent().dataset;
diff --git a/addons/web/static/src/js/widgets/user_menu.js b/addons/web/static/src/js/widgets/user_menu.js
index dba1704c719..3d360c1eae6 100644
--- a/addons/web/static/src/js/widgets/user_menu.js
+++ b/addons/web/static/src/js/widgets/user_menu.js
@@ -101,9 +101,10 @@ var SystrayMenu = Widget.extend({
             });
             new Dialog(this, {
                 size: 'medium',
-                dialogClass: 'oe_act_window',
+                dialogClass: 'o_act_window',
                 title: _t("About"),
-            }, $help).open();
+                $content: $help
+            }).open();
         });
     },
 });