diff --git a/css/backoffice/blocks-integrations/_all.scss b/css/backoffice/blocks-integrations/_all.scss index af56b7dd7..f9c36e5ff 100644 --- a/css/backoffice/blocks-integrations/_all.scss +++ b/css/backoffice/blocks-integrations/_all.scss @@ -13,3 +13,4 @@ @import "object-details-with-tab-container"; @import "medallion-with-blocklist"; @import "input-within-datatable"; +@import "jquery-blockui-within-dialog"; \ No newline at end of file diff --git a/css/backoffice/blocks-integrations/_jquery-blockui-within-dialog.scss b/css/backoffice/blocks-integrations/_jquery-blockui-within-dialog.scss new file mode 100644 index 000000000..c0f8eb6da --- /dev/null +++ b/css/backoffice/blocks-integrations/_jquery-blockui-within-dialog.scss @@ -0,0 +1,9 @@ +/*! + * @copyright Copyright (C) 2010-2021 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ +$ibo-vendors-blockui--blockoverlay--within--dialog--background-color: $ibo-vendors-jqueryui--ui-dialog--background-color !default; + +.ui-dialog .blockUI.blockOverlay{ + background-color: $ibo-vendors-blockui--blockoverlay--within--dialog--background-color; +} \ No newline at end of file diff --git a/css/backoffice/vendors/_all.scss b/css/backoffice/vendors/_all.scss index b5b691e2b..645f655bd 100644 --- a/css/backoffice/vendors/_all.scss +++ b/css/backoffice/vendors/_all.scss @@ -22,4 +22,5 @@ @import "jqueryui"; @import "jquery-multiselect"; @import "datatables"; -@import "jquery-treeview"; \ No newline at end of file +@import "jquery-treeview"; +@import "jquery-blockui"; \ No newline at end of file diff --git a/css/backoffice/vendors/_jquery-blockui.scss b/css/backoffice/vendors/_jquery-blockui.scss new file mode 100644 index 000000000..da53f0c3c --- /dev/null +++ b/css/backoffice/vendors/_jquery-blockui.scss @@ -0,0 +1,18 @@ +/*! + * @copyright Copyright (C) 2010-2021 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ + +$ibo-vendors-blockui--blockoverlay--background-color: $ibo-color-white-200 !default; +$ibo-vendors-blockui--blockomsg--color: $ibo-color-grey-700 !default; + +.blockUI.blockOverlay{ + background-color: $ibo-color-white-200; +} +.blockUI.blockMsg{ + font-size: 6em; + text-align: center; + color: $ibo-color-grey-700; + border: none; + background-color: transparent; +} \ No newline at end of file diff --git a/sources/application/WebPage/iTopWebPage.php b/sources/application/WebPage/iTopWebPage.php index e11977f4b..f6fc8ce70 100644 --- a/sources/application/WebPage/iTopWebPage.php +++ b/sources/application/WebPage/iTopWebPage.php @@ -380,6 +380,11 @@ JS PrepareWidgets(); }, 500); }); + + // Default values for blockui + $.blockUI.defaults.css = {}; + $.blockUI.defaults.message= ''; + $.blockUI.defaults.overlayCSS = {} JS );