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

1 files changed, 11 insertions, 19 deletions

diff --git a/addons/web/static/src/js/framework/crash_manager.js b/addons/web/static/src/js/framework/crash_manager.js
index 303cd66a4a3..4ab40f456bc 100644
--- a/addons/web/static/src/js/framework/crash_manager.js
+++ b/addons/web/static/src/js/framework/crash_manager.js
@@ -118,23 +118,17 @@ var CrashManager = core.Class.extend({
             size: 'medium',
             title: "Odoo " + (_.str.capitalize(error.type) || _t("Warning")),
             subtitle: error.data.title,
-            buttons: [
-                {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
-            ],
-        }, $('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>')).open();
+            $content: $('<div>').html(QWeb.render('CrashManager.warning', {error: error}))
+        }).open();
     },
     show_error: function(error) {
         if (!this.active) {
             return;
         }
-        var buttons = {};
-        buttons[_t("Ok")] = function() {
-            this.parents('.modal').modal('hide');
-        };
         new Dialog(this, {
             title: "Odoo " + _.str.capitalize(error.type),
-            buttons: buttons
-        }, QWeb.render('CrashManager.error', {session: session, error: error})).open();
+            $content: QWeb.render('CrashManager.error', {session: session, error: error})
+        }).open();
     },
     show_message: function(exception) {
         this.show_error({
@@ -181,16 +175,14 @@ var RedirectWarningHandler = Dialog.extend(ExceptionHandler, {
             size: 'medium',
             title: "Odoo " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
-                {text: error.data.arguments[2],
-                    oe_link_class : 'oe_highlight',
-                    post_text : _t("or"),
-                    click: function() {
-                        window.location.href='#action='+error.data.arguments[1];
-                        self.destroy();
-                    }},
-                {text: _t("Cancel"), oe_link_class: 'oe_link', click: function() { self.$el.parents('.modal').modal('hide');  self.destroy();}}
+                {text: error.data.arguments[2], classes : "btn-primary", click: function() {
+                    window.location.href = '#action='+error.data.arguments[1];
+                    self.destroy();
+                }},
+                {text: _t("Cancel"), click: function() { self.destroy(); }, close: true}
             ],
-        }, QWeb.render('CrashManager.warning', {error: error})).open();
+            $content: QWeb.render('CrashManager.warning', {error: error})
+        }).open();
     }
 });