composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°7315 - Migrate deprecated usages of WebPage::add_linked_stylesheet()

Browse Source
This commit is contained in:
Molkobain
2024-03-05 23:06:44 +01:00
parent 655539c289
commit fe6ee083f6
15 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/cmdbabstract.class.inc.php
View File

@@ -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');

4
application/loginwebpage.class.inc.php
View File

@@ -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');
}
/**

8
datamodels/2.x/itop-hub-connector/land.php
View File

@@ -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('<table class="module-selection-banner"><tr>');
$sBannerUrl = utils::GetAbsoluteUrlModulesRoot().'/itop-hub-connector/images/landing-extension.png';
$oPage->add('<td><img style="max-height:72px; margin-right: 10px;" src="'.$sBannerUrl.'"/><td>');
@@ -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('<table class="module-selection-banner"><tr>');
$sBannerUrl = utils::GetAbsoluteUrlModulesRoot().'/itop-hub-connector/images/landing-extension.png';
$oPage->add('<td><img style="max-height:72px; margin-right: 10px;" src="'.$sBannerUrl.'"/><td>');
@@ -214,7 +214,7 @@ function DoInstall(WebPage $oPage)
$oPage->add('</div>'); // 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('<div id="hub_installation_widget"></div>');
@@ -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(<<<CSS
div.choice { margin: 0.5em;}

4
datamodels/2.x/itop-hub-connector/launch.php
View File

@@ -306,8 +306,8 @@ try {
$oPage = new HubConnectorPage(Dict::S('iTopHub:Connect'));
$oPage->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);

2
pages/ajax.render.php
View File

@@ -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;

8
setup/setuppage.class.inc.php
View File

@@ -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");

4
sources/Application/Helper/WebResourcesHelper.php
View File

@@ -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');

4
sources/Application/WebPage/ErrorPage.php
View File

@@ -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');
}

2
sources/Application/WebPage/NiceWebPage.php
View File

@@ -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

8
sources/Application/WebPage/UnauthenticatedWebPage.php
View File

@@ -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);
}
}

2
sources/Application/WebPage/WebPage.php
View File

@@ -1243,7 +1243,7 @@ JS;
$sRootUrl = '../';
}
$sCSSUrl = $sRootUrl.$sCssRelPath;
$this->add_linked_stylesheet($sCSSUrl);
$this->LinkStylesheetFromURI($sCSSUrl);
}
/**

18
sources/Application/WebPage/iTopWebPage.php
View File

@@ -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

2
sources/Renderer/Console/ConsoleBlockRenderer.php
View File

@@ -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) {

6
webservices/export-v2.php
View File

@@ -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();

4
webservices/export.php
View File

@@ -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