From 634b5f7d1b1316998efdfafbff32e1afe5e894cd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 31 Oct 2012 15:50:14 +0100 Subject: [PATCH 1/2] Fix: image is hard defined --- htdocs/core/js/blockUI.js | 2 +- htdocs/main.inc.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/core/js/blockUI.js b/htdocs/core/js/blockUI.js index b5b9e86072d..64eb9472836 100644 --- a/htdocs/core/js/blockUI.js +++ b/htdocs/core/js/blockUI.js @@ -94,7 +94,7 @@ $(document).ready(function() { css: { border: 'none', padding: '15px', - background: '#000 url(/theme/eldy/img/working2.gif) no-repeat 10px center', + background: '#000 url(' + indicatorBlockUI + ') no-repeat 10px center', '-webkit-border-radius': '10px', '-moz-border-radius': '10px', 'border-radius': '10px', diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 4fa01b4f116..7cc12bbba03 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -968,6 +968,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs if (! empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) || defined('REQUIRE_JQUERY_BLOCKUI')) { print ''."\n"; + print ''."\n"; print ''."\n"; } // Flot From 455d399bce6fb9c0c946ac169236c168000bc6d8 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 31 Oct 2012 16:15:37 +0100 Subject: [PATCH 2/2] Fix: remove tag --- htdocs/main.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 7cc12bbba03..ce793f0ffad 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -969,7 +969,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs { print ''."\n"; print ''."\n"; print ''."\n"; }