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

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

Browse Source
This commit is contained in:
Molkobain
2022-04-08 13:32:08 +02:00
parent 42599eae64 2716f9d24c
commit 1feb5e6ad6
33 changed files with 379 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/Application/Branding.php
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',
],
];

2
sources/Application/WebPage/ErrorPage.php
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);

2
sources/Application/WebPage/UnauthenticatedWebPage.php
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');

20
sources/Controller/AjaxRenderController.php
View File

@@ -826,9 +826,8 @@ $('#about_box').dialog({
EOF
);
$sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
$oPage->add("<div id=\"about_box\">");
$oPage->add('<div style="text-align: center;">');
$oPage->add('<a href="http://www.combodo.com" title="www.combodo.com" target="_blank" style="background: none;"><img src="../images/logo-combodo.png?t='.utils::GetCacheBusterTimestamp().'"/></a>');
$oPage->add('<div id="about_box"><div class="ibo-about-box--top-part">');
$oPage->add('<div><a href="http://www.combodo.com" title="www.combodo.com" target="_blank"><img src="../images/logos/logo-combodo-dark.svg?t='.utils::GetCacheBusterTimestamp().'"/></a></div>');
$oPage->add('<div>'.$sVersionString.'</div>');
$oPage->add("</div>");
self::DisplayAboutLicenses($oPage);
@@ -909,18 +908,9 @@ EOF
// Display
//
$oPage->add("<div id=\"about_box\">");
$oPage->add('<div style="margin-left: 120px;">');
$oPage->add('<table>');
$oPage->add('<tr>');
$oPage->add('<td><a href="http://www.combodo.com" title="www.combodo.com" target="_blank" style="background: none;"><img src="../images/logo-combodo.png?t='.utils::GetCacheBusterTimestamp().'" style="float: right;"/></a></td>');
$oPage->add('<td style="padding-left: 20px;">');
$oPage->add($sVersionString.'<br/>');
$oPage->add('MySQL: '.$sMySQLVersion.'<br/>');
$oPage->add('PHP: '.$sPHPVersion.'<br/>');
$oPage->add('</td>');
$oPage->add('</tr>');
$oPage->add('</table>');
$oPage->add('<div id="about_box"><div class="ibo-about-box--top-part">');
$oPage->add('<div><a href="http://www.combodo.com" title="www.combodo.com" target="_blank"><img src="../images/logos/logo-combodo-dark.svg?t='.utils::GetCacheBusterTimestamp().'"/></a></div>');
$oPage->add('<div>'.$sVersionString.'<br/>'.'MySQL: '.$sMySQLVersion.'<br/>'.'PHP: '.$sPHPVersion.'<br/></div>');
$oPage->add("</div>");
self::DisplayAboutLicenses($oPage);

7
sources/Controller/Base/Layout/ActivityPanelController.php
View File

@@ -116,7 +116,9 @@ class ActivityPanelController
'html_rendering' => $sEntryAsHtml,
];
}
// Finalize inline images
InlineImage::FinalizeInlineImages($oObject);
// Invoke extensions after the update of the object from the activity form
/** @var \iApplicationUIExtension $oExtensionInstance */
foreach(MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
@@ -126,9 +128,6 @@ class ActivityPanelController
$oObject->DBWrite();
// Finalize inline images
InlineImage::FinalizeInlineImages($oObject);
return $aResults;
}