diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index f4cb1ddbe..626f27107 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -2576,7 +2576,7 @@ JS case 'TagSet': $sInputType = self::ENUM_INPUT_TYPE_TAGSET; $oPage->LinkScriptFromAppRoot('js/selectize.min.js'); - $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/selectize.default.css'); + $oPage->LinkStylesheetFromAppRoot('css/selectize.default.css'); $oPage->LinkScriptFromAppRoot('js/jquery.itop-set-widget.js'); $oPage->add_dict_entry('Core:AttributeSet:placeholder'); diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php index 5c5cb6eaf..91aba1b12 100644 --- a/application/loginwebpage.class.inc.php +++ b/application/loginwebpage.class.inc.php @@ -97,8 +97,8 @@ class LoginWebPage extends NiceWebPage public function SetStyleSheet() { - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/login.css'); - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css'); + $this->LinkStylesheetFromAppRoot('css/login.css'); + $this->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css'); } /** diff --git a/datamodels/2.x/itop-hub-connector/land.php b/datamodels/2.x/itop-hub-connector/land.php index f9ea9a245..ee0046a0a 100644 --- a/datamodels/2.x/itop-hub-connector/land.php +++ b/datamodels/2.x/itop-hub-connector/land.php @@ -57,7 +57,7 @@ function DisplayStatus(WebPage $oPage) function DoLanding(WebPage $oPage) { - $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlModulesRoot().'itop-hub-connector/css/hub.css'); + $oPage->LinkStylesheetFromModule('itop-hub-connector/css/hub.css'); $oPage->add(''); $sBannerUrl = utils::GetAbsoluteUrlModulesRoot().'/itop-hub-connector/images/landing-extension.png'; $oPage->add('
'); @@ -138,7 +138,7 @@ function DoInstall(WebPage $oPage) $sUID = hash('sha256', rand()); file_put_contents(APPROOT.'data/hub/compile_authent', $sUID); - $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlModulesRoot().'itop-hub-connector/css/hub.css'); + $oPage->LinkStylesheetFromModule('itop-hub-connector/css/hub.css'); $oPage->add(''); $sBannerUrl = utils::GetAbsoluteUrlModulesRoot().'/itop-hub-connector/images/landing-extension.png'; $oPage->add('
'); @@ -214,7 +214,7 @@ function DoInstall(WebPage $oPage) $oPage->add(''); // module-selection-body - $oPage->add_linked_stylesheet('../css/font-awesome/css/all.min.css'); + $oPage->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css'); $oPage->add('
'); @@ -264,7 +264,7 @@ try { $oPage = new SetupPage(''); // Title will be set later, depending on $sOperation $oPage->LinkScriptFromModule('itop-hub-connector/js/hub.js'); - $oPage->add_linked_stylesheet('../css/font-combodo/font-combodo.css'); + $oPage->LinkStylesheetFromAppRoot('css/font-combodo/font-combodo.css'); $oPage->add_style(<<LinkScriptFromModule('itop-hub-connector/js/hub.js'); - $oPage->add_linked_stylesheet('../css/font-combodo/font-combodo.css'); - $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlModulesRoot().'itop-hub-connector/css/hub.css'); + $oPage->LinkStylesheetFromAppRoot('css/font-combodo/font-combodo.css'); + $oPage->LinkStylesheetFromModule('itop-hub-connector/css/hub.css'); $aDataToPost = MakeDataToPost($sTargetRoute); diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 0015ebf59..dfcb9bf00 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -2207,7 +2207,7 @@ EOF case 'cke_browse': $oPage = new NiceWebPage(Dict::S('UI:BrowseInlineImages')); - $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'node_modules/magnific-popup/dist/magnific-popup.css'); + $oPage->LinkStylesheetFromAppRoot('node_modules/magnific-popup/dist/magnific-popup.css'); $oPage->LinkScriptFromAppRoot('node_modules/magnific-popup/dist/jquery.magnific-popup.min.js'); $sAppRootUrl = utils::GetAbsoluteUrlAppRoot(); $sImgUrl = $sAppRootUrl.INLINEIMAGE_DOWNLOAD_URL; diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php index 27b837517..1a145098a 100644 --- a/setup/setuppage.class.inc.php +++ b/setup/setuppage.class.inc.php @@ -43,10 +43,10 @@ class SetupPage extends NiceWebPage $this->LinkScriptFromAppRoot('node_modules/@popperjs/core/dist/umd/popper.js'); $this->LinkScriptFromAppRoot('node_modules/tippy.js/dist/tippy-bundle.umd.js'); $this->LinkScriptFromAppRoot("setup/setup.js"); - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css'); - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-combodo/font-combodo.css'); - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'node_modules/tippy.js/dist/tippy.css'); - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'node_modules/tippy.js/animations/shift-away-subtle.css'); + $this->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css'); + $this->LinkStylesheetFromAppRoot('css/font-combodo/font-combodo.css'); + $this->LinkStylesheetFromAppRoot('node_modules/tippy.js/dist/tippy.css'); + $this->LinkStylesheetFromAppRoot('node_modules/tippy.js/animations/shift-away-subtle.css'); $this->LoadTheme(); $this->add_saas("css/setup.scss"); diff --git a/sources/Application/Helper/WebResourcesHelper.php b/sources/Application/Helper/WebResourcesHelper.php index 8a45dbea6..299a97a5a 100644 --- a/sources/Application/Helper/WebResourcesHelper.php +++ b/sources/Application/Helper/WebResourcesHelper.php @@ -93,7 +93,7 @@ class WebResourcesHelper public static function EnableC3JSToWebPage(WebPage &$oPage): void { foreach (static::GetCSSFilesRelPathsForC3JS() as $sFile) { - $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().$sFile); + $oPage->LinkStylesheetFromAppRoot($sFile); } foreach (static::GetJSFilesRelPathsForC3JS() as $sFile) { @@ -137,7 +137,7 @@ class WebResourcesHelper { $oPage->LinkScriptFromAppRoot('js/raphael-min.js'); $oPage->LinkScriptFromAppRoot('js/fraphael.js'); - $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'node_modules/jquery-contextmenu/src/jquery.contextMenu.css'); + $oPage->LinkStylesheetFromAppRoot('node_modules/jquery-contextmenu/src/jquery.contextMenu.css'); $oPage->LinkScriptFromAppRoot('node_modules/jquery-contextmenu/src/jquery.contextMenu.js'); $oPage->LinkScriptFromAppRoot('js/jquery.positionBy.js'); $oPage->LinkScriptFromAppRoot('js/jquery.popupmenu.js'); diff --git a/sources/Application/WebPage/ErrorPage.php b/sources/Application/WebPage/ErrorPage.php index 7119f4067..0df171dd5 100644 --- a/sources/Application/WebPage/ErrorPage.php +++ b/sources/Application/WebPage/ErrorPage.php @@ -28,8 +28,8 @@ class ErrorPage extends NiceWebPage parent::__construct($sTitle); $this->LinkScriptFromAppRoot("js/jquery.blockUI.js"); $this->LinkScriptFromAppRoot("setup/setup.js"); - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css'); - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-combodo/font-combodo.css'); + $this->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css'); + $this->LinkStylesheetFromAppRoot('css/font-combodo/font-combodo.css'); $this->add_saas("css/setup.scss"); $oKpi->ComputeStats(get_class($this).' creation', 'ErrorPage'); } diff --git a/sources/Application/WebPage/NiceWebPage.php b/sources/Application/WebPage/NiceWebPage.php index d00a49663..a5eba310c 100644 --- a/sources/Application/WebPage/NiceWebPage.php +++ b/sources/Application/WebPage/NiceWebPage.php @@ -250,7 +250,7 @@ JS // TODO 3.0.0: Remove light-grey when development of Full Moon is done. // TODO 3.0.0: Reuse theming mechanism for Full Moon $sCssThemeUrl = ThemeHandler::GetCurrentThemeUrl(); - $this->add_linked_stylesheet($sCssThemeUrl); + $this->LinkStylesheetFromURI($sCssThemeUrl); } protected function GetReadyScriptsStartedTrigger(): ?string diff --git a/sources/Application/WebPage/UnauthenticatedWebPage.php b/sources/Application/WebPage/UnauthenticatedWebPage.php index f085fcebe..693ea8953 100644 --- a/sources/Application/WebPage/UnauthenticatedWebPage.php +++ b/sources/Application/WebPage/UnauthenticatedWebPage.php @@ -85,9 +85,9 @@ class UnauthenticatedWebPage extends NiceWebPage $this->LinkScriptFromURI(UAWP_PORTAL_PUBLIC_FOLDER_ABSOLUTE_URL . 'lib/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); // CSS files - $this->add_linked_stylesheet(UAWP_PORTAL_PUBLIC_FOLDER_ABSOLUTE_URL . 'lib/bootstrap/css/bootstrap.min.css'); + $this->LinkStylesheetFromURI(UAWP_PORTAL_PUBLIC_FOLDER_ABSOLUTE_URL . 'lib/bootstrap/css/bootstrap.min.css'); $this->add_saas(UAWP_PORTAL_PUBLIC_FOLDER_RELATIVE_PATH . 'css/bootstrap-theme-combodo.scss'); - $this->add_linked_stylesheet(UAWP_PORTAL_PUBLIC_FOLDER_ABSOLUTE_URL . 'lib/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css'); + $this->LinkStylesheetFromURI(UAWP_PORTAL_PUBLIC_FOLDER_ABSOLUTE_URL . 'lib/bootstrap-datetimepicker/css/bootstrap-datetimepicker.css'); // Default theme $this->add_saas('css/unauthenticated.scss'); @@ -278,13 +278,13 @@ class UnauthenticatedWebPage extends NiceWebPage */ protected function LoadTheme() { - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css'); + $this->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css'); // Default theme $this->add_saas('css/unauthenticated.scss'); // Custom theme to allow admin to override the default one. if(!empty($this->sCustomThemeUrl)) { - $this->add_linked_stylesheet($this->sCustomThemeUrl); + $this->LinkStylesheetFromURI($this->sCustomThemeUrl); } } diff --git a/sources/Application/WebPage/WebPage.php b/sources/Application/WebPage/WebPage.php index 72f1df20f..b0c576f47 100644 --- a/sources/Application/WebPage/WebPage.php +++ b/sources/Application/WebPage/WebPage.php @@ -1243,7 +1243,7 @@ JS; $sRootUrl = '../'; } $sCSSUrl = $sRootUrl.$sCssRelPath; - $this->add_linked_stylesheet($sCSSUrl); + $this->LinkStylesheetFromURI($sCSSUrl); } /** diff --git a/sources/Application/WebPage/iTopWebPage.php b/sources/Application/WebPage/iTopWebPage.php index c56fe19ae..74eac0b0f 100644 --- a/sources/Application/WebPage/iTopWebPage.php +++ b/sources/Application/WebPage/iTopWebPage.php @@ -257,24 +257,24 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage parent::InitializeLinkedStylesheets(); // Used by advanced search, date(time) attributes. Coupled to the PrepareWidgets() JS function. - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/jquery-ui-timepicker-addon.css'); + $this->LinkStylesheetFromAppRoot('css/jquery-ui-timepicker-addon.css'); // Used by inline image, CKEditor and other places - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'node_modules/magnific-popup/dist/magnific-popup.css'); + $this->LinkStylesheetFromAppRoot('node_modules/magnific-popup/dist/magnific-popup.css'); // Tooltips - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'node_modules/tippy.js/dist/tippy.css'); - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'node_modules/tippy.js/animations/shift-away-subtle.css'); + $this->LinkStylesheetFromAppRoot('node_modules/tippy.js/dist/tippy.css'); + $this->LinkStylesheetFromAppRoot('node_modules/tippy.js/animations/shift-away-subtle.css'); // Icons - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css'); - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-combodo/font-combodo.css'); + $this->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css'); + $this->LinkStylesheetFromAppRoot('css/font-combodo/font-combodo.css'); // Note: CKEditor files can't be moved easily as we need to find a way to init the "disabler" plugin, {@see js/toolbox.js} - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'js/ckeditor/plugins/codesnippet/lib/highlight/styles/obsidian.css'); + $this->LinkStylesheetFromAppRoot('js/ckeditor/plugins/codesnippet/lib/highlight/styles/obsidian.css'); // Used by external keys and other drop down lists - $this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/selectize.default.css'); + $this->LinkStylesheetFromAppRoot('css/selectize.default.css'); } /** @@ -898,7 +898,7 @@ HTML; /** @var \iBackofficeLinkedStylesheetsExtension $oExtensionInstance */ foreach (MetaModel::EnumPlugins('iBackofficeLinkedStylesheetsExtension') as $oExtensionInstance) { foreach ($oExtensionInstance->GetLinkedStylesheetsAbsUrls() as $sStylesheetUrl) { - $this->add_linked_stylesheet($sStylesheetUrl); + $this->LinkStylesheetFromURI($sStylesheetUrl); } } // - API: Inline style diff --git a/sources/Renderer/Console/ConsoleBlockRenderer.php b/sources/Renderer/Console/ConsoleBlockRenderer.php index 41470f996..f5f484376 100644 --- a/sources/Renderer/Console/ConsoleBlockRenderer.php +++ b/sources/Renderer/Console/ConsoleBlockRenderer.php @@ -80,7 +80,7 @@ class ConsoleBlockRenderer extends BlockRenderer { // CSS files foreach ($oBlock->GetCssFilesUrlRecursively(true) as $sFileAbsUrl) { - $oPage->add_linked_stylesheet($sFileAbsUrl); + $oPage->LinkStylesheetFromURI($sFileAbsUrl); } // JS files foreach ($oBlock->GetJsFilesUrlRecursively(true) as $sFileAbsUrl) { diff --git a/webservices/export-v2.php b/webservices/export-v2.php index d5d638a70..356ee3c67 100644 --- a/webservices/export-v2.php +++ b/webservices/export-v2.php @@ -237,7 +237,7 @@ EOF ); $oP->LinkScriptFromAppRoot('js/tabularfieldsselector.js'); $oP->LinkScriptFromAppRoot('js/jquery.dragtable.js'); - $oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css'); + $oP->LinkStylesheetFromAppRoot('css/dragtable.css'); $oForm = FormUIBlockFactory::MakeStandard("export-form"); $oForm->SetAction($sAction); @@ -707,8 +707,8 @@ try $oP = new NiceWebPage('iTop export'); $oP->add_http_headers(); $oP->add_ready_script("$('table.listResults').tablesorter({widgets: ['MyZebra']});"); - $oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css'); - $oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/v4-shims.min.css'); + $oP->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css'); + $oP->LinkStylesheetFromAppRoot('css/font-awesome/css/v4-shims.min.css'); } else { $oP = new WebPage('iTop export'); $oP->add_http_headers(); diff --git a/webservices/export.php b/webservices/export.php index 578a4c83e..6b60361e5 100644 --- a/webservices/export.php +++ b/webservices/export.php @@ -219,8 +219,8 @@ if (!empty($sExpression)) case 'html': $oP = new NiceWebPage("iTop - Export"); $oP->add_style('body { overflow: auto; }'); // Show scroll bars if needed - $oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css'); - $oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/v4-shims.min.css'); + $oP->LinkStylesheetFromAppRoot('css/font-awesome/css/all.min.css'); + $oP->LinkStylesheetFromAppRoot('css/font-awesome/css/v4-shims.min.css'); // Integration within MS-Excel web queries + HTTPS + IIS: // MS-IIS set these header values with no-cache... while Excel fails to do the job if using HTTPS