composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 02:28:44 +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

4
setup/compiler.class.inc.php
View File

@@ -3585,6 +3585,8 @@ EOF;
* @param $sRelativeDir
*
* @throws \Exception
*
* @since 2.7.0 N°2498
*/
protected function WriteStaticOnlyHtaccess($sTempTargetDir)
{
@@ -3626,6 +3628,8 @@ EOF;
* @param $sModuleVersion
*
* @throws \Exception
*
* @since 2.7.0 N°2498
*/
protected function WriteStaticOnlyWebConfig($sTempTargetDir)
{

BIN
setup/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

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

@@ -157,7 +157,7 @@ class SetupPage extends NiceWebPage
public function output()
{
$sLogo = utils::GetAbsoluteUrlAppRoot().'/images/itop-logo.png?t='.utils::GetCacheBusterTimestamp();
$sLogo = utils::GetAbsoluteUrlAppRoot().'/images/logos/logo-itop-simple-dark.svg?t='.utils::GetCacheBusterTimestamp();
$oSetupPage = UIContentBlockUIBlockFactory::MakeStandard();
$oHeader = UIContentBlockUIBlockFactory::MakeStandard('header', ['ibo-setup--header']);
$oSetupPage->AddSubBlock($oHeader);