Merge remote-tracking branch 'origin/support/3.0' into develop

This commit is contained in:
Molkobain
2022-04-08 13:32:08 +02:00
33 changed files with 379 additions and 127 deletions

View File

@@ -53,7 +53,7 @@ class Branding
'default' => 'images/logo-itop-dark-bg.svg',
],
self::ENUM_LOGO_TYPE_LOGIN_LOGO => [
'default' => 'images/itop-logo.png',
'default' => 'images/itop-logo-external.png',
],
];

View File

@@ -60,7 +60,7 @@ class ErrorPage extends NiceWebPage
public function output()
{
$sLogo = Branding::GetFullMainLogoAbsoluteUrl();
$sLogo = Branding::GetLoginLogoAbsoluteUrl();
$oSetupPage = UIContentBlockUIBlockFactory::MakeStandard('ibo_setup_container', ['ibo-setup']);
$oHeader = UIContentBlockUIBlockFactory::MakeStandard('header', ['ibo-setup--header']);
$oSetupPage->AddSubBlock($oHeader);

View File

@@ -73,7 +73,7 @@ class UnauthenticatedWebPage extends NiceWebPage
$this->sContent = '';
$this->sPanelTitle = '';
$this->sPanelIcon = Branding::GetFullMainLogoAbsoluteUrl();
$this->sPanelIcon = Branding::GetLoginLogoAbsoluteUrl();
$this->SetContentType('text/html');