From f11f0dd9e30e5596aa71174f01dfc0e2fa1a1d6e Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 22 Aug 2011 18:34:32 +0200 Subject: [PATCH] [IMP] use same throbber for creation and home bzr revid: al@openerp.com-20110822163432-s6n02em21hpi4uk1 --- .../static/src/img/throbber2.gif} | Bin addons/base/static/src/js/chrome.js | 6 +++--- addons/base_default_home/static/src/js/home.js | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) rename addons/{base_default_home/static/src/img/throbber.gif => base/static/src/img/throbber2.gif} (100%) diff --git a/addons/base_default_home/static/src/img/throbber.gif b/addons/base/static/src/img/throbber2.gif similarity index 100% rename from addons/base_default_home/static/src/img/throbber.gif rename to addons/base/static/src/img/throbber2.gif diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 665efa0e3e3..4cebdcc2893 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -296,7 +296,7 @@ openerp.base.Database = openerp.base.Widget.extend({ self.$option_id.find("form[name=create_db_form]").validate({ submitHandler: function (form) { var fields = $(form).serializeArray(); - $.blockUI(); + $.blockUI({message:''}); self.rpc("/base/database/create", {'fields': fields}, function(result) { if (result.error) { $.unblockUI(); @@ -367,7 +367,7 @@ openerp.base.Database = openerp.base.Widget.extend({ self.$option_id.find("form[name=backup_db_form]").validate({ submitHandler: function (form) { - $.blockUI(); + $.blockUI({message:''}); // need to detect when the file is done downloading (not used // yet, but we'll need it to fix the UI e.g. with a throbber // while dump is being generated), iframe load event only fires @@ -405,7 +405,7 @@ openerp.base.Database = openerp.base.Widget.extend({ self.$option_id.find("form[name=restore_db_form]").validate({ submitHandler: function (form) { - $.blockUI(); + $.blockUI({message:''}); $(form).ajaxSubmit({ url: '/base/database/restore', type: 'POST', diff --git a/addons/base_default_home/static/src/js/home.js b/addons/base_default_home/static/src/js/home.js index eaa8a72e3fa..57b5fab71f3 100644 --- a/addons/base_default_home/static/src/js/home.js +++ b/addons/base_default_home/static/src/js/home.js @@ -97,9 +97,7 @@ openerp.base_default_home = function (openerp) { this, 'ir.module.module', null, [['name', '=', module_name], ['state', '=', 'uninstalled']]); var Upgrade = new openerp.base.DataSet(this, 'base.module.upgrade'); - $.blockUI({ - message: '' - }); + $.blockUI({message:''}); Modules.read_slice(['id'], {}, function (records) { if (!(records.length === 1)) { return; } Modules.call('state_update',