From ab1bf880f13360aadde96ac229acf855db0af26d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 27 Oct 2011 14:45:03 +0200
Subject: [PATCH] [IMP] blockUI defaults configuration

* Set throbber image as the default message
* Ensure blockUI is on top of dialogs

bzr revid: xmo@openerp.com-20111027124503-i4u0fmqij3o80sy3
---
 addons/web/static/src/js/chrome.js              | 6 +++---
 addons/web/static/src/js/core.js                | 4 ++++
 addons/web_dashboard/static/src/js/dashboard.js | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index bdb8e23c20b..38923d268cf 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -343,7 +343,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
         self.$option_id.find("form[name=create_db_form]").validate({
             submitHandler: function (form) {
                 var fields = $(form).serializeArray();
-                $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
+                $.blockUI();
                 self.rpc("/web/database/create", {'fields': fields}, function(result) {
                     if (result.error) {
                         $.unblockUI();
@@ -392,7 +392,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
             .html(QWeb.render("BackupDB", self))
             .find("form[name=backup_db_form]").validate({
             submitHandler: function (form) {
-                $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
+                $.blockUI();
                 self.session.get_file({
                     form: form,
                     error: function (body) {
@@ -413,7 +413,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
 
        	self.$option_id.find("form[name=restore_db_form]").validate({
             submitHandler: function (form) {
-                $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
+                $.blockUI();
                 $(form).ajaxSubmit({
                     url: '/web/database/restore',
                     type: 'POST',
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index ab0247e81b4..9563abea49a 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -1043,6 +1043,10 @@ openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.we
     }
 });
 
+if ($.blockUI) {
+    $.blockUI.defaults.baseZ = 1100;
+    $.blockUI.defaults.message = '<img src="/web/static/src/img/throbber2.gif">';
+}
 openerp.web._t = new openerp.web.TranslationDataBase().build_translation_function();
 openerp.web.qweb = new QWeb2.Engine();
 openerp.web.qweb.debug = (window.location.search.indexOf('?debug') !== -1);
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index 923b43ce034..b5f3b606d71 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -468,7 +468,7 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({
             [['name', '=', module_name], ['state', '=', 'uninstalled']]);
         var Upgrade = new openerp.web.DataSet(this, 'base.module.upgrade');
 
-        $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
+        $.blockUI();
         Modules.read_slice(['id'], {}, function (records) {
             if (!(records.length === 1)) { $.unblockUI(); return; }
             Modules.call('state_update',