Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git in…

…to develop
Dolibarr · Sep 4, 2012 · 95fc429 · 95fc429
2 parents aea8938 + 58a9dc1
commit 95fc429
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git 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'
+			}
+		});
+	}
 });
diff --git 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 '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout-latest'.$ext.'"></script>'."\n";
             }
             // jQuery jnotify
-            if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY))
+            if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
             {
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js"></script>'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/jnotify.js"></script>'."\n";
             }
             // jQuery blockUI
-            if (! empty($conf->global->MAIN_USE_JQUERY_BLOCKUI))
+            if (! empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) || defined('REQUIRE_JQUERY_BLOCKUI'))
             {
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/blockUI/jquery.blockUI.js"></script>'."\n";
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/blockUI.js"></script>'."\n";