diff --git a/htdocs/core/js/blockUI.js b/htdocs/core/js/blockUI.js
index 9be6eaa4de1..f0a3a5ac2f9 100644
--- a/htdocs/core/js/blockUI.js
+++ b/htdocs/core/js/blockUI.js
@@ -23,7 +23,7 @@
// Examples
$(document).ready(function() {
// override these in your code to change the default behavior and style
- $.blockUI.defaults = {
+ $.blockUI.events = {
// styles applied when using $.growlUI
dolEventValidCSS: {
@@ -70,7 +70,7 @@ $(document).ready(function() {
message: $m, fadeIn: 200, fadeOut: 700, centerY: false,
timeout: timeout, showOverlay: false,
onUnblock: onClose,
- css: $.blockUI.defaults.dolEventValidCSS
+ css: $.blockUI.events.dolEventValidCSS
});
};
@@ -83,8 +83,24 @@ $(document).ready(function() {
message: $m, fadeIn: 200, centerY: false,
timeout: timeout, showOverlay: false,
onUnblock: onClose,
- css: $.blockUI.defaults.dolEventErrorCSS
+ css: $.blockUI.events.dolEventErrorCSS
});
$('.dolEventError').click($.unblockUI);
};
+
+ $.pleaseBePatient = function(message) {
+ $.blockUI({
+ message: message,
+ css: {
+ border: 'none',
+ padding: '15px',
+ backgroundColor: '#000',
+ '-webkit-border-radius': '10px',
+ '-moz-border-radius': '10px',
+ 'border-radius': '10px',
+ opacity: .5,
+ color: '#fff'
+ }
+ });
+ }
});
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c756301a762..866e25a4abd 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -958,13 +958,13 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print ''."\n";
}
// jQuery jnotify
- if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY))
+ if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
{
print ''."\n";
print ''."\n";
}
// jQuery blockUI
- if (! empty($conf->global->MAIN_USE_JQUERY_BLOCKUI))
+ if (! empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) || defined('REQUIRE_JQUERY_BLOCKUI'))
{
print ''."\n";
print ''."\n";