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

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

Browse Source 
# Conflicts:
#	core/config.class.inc.php
#	setup/itopdesignformat.class.inc.php
This commit is contained in:
Molkobain
2022-01-27 16:09:22 +01:00
parent 44c18395b3 b89d181125
commit 3bec96abe1
102 changed files with 986 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -841,10 +841,6 @@ HTML;
foreach (MetaModel::EnumPlugins('iBackofficeStyleExtension') as $oExtensionInstance) {
$this->add_style($oExtensionInstance->GetStyle());
}
// - Generate necessary dict. files
if ($this->bAddJSDict) {
$this->output_dict_entries();
}
// TODO 3.0.0 not displayed ?
$this->GetContentLayout()->SetExtraHtmlContent(utils::FilterXSS($this->s_content));
@@ -909,9 +905,13 @@ HTML;
// Components
// Note: For now all components are either included in the layouts above or put in page through the AddUiBlock() API, so there is no need to do anything more.
$this->InitializeKeyboardShortcuts();
// - Generate necessary dict. files
if ($this->bAddJSDict) {
$this->output_dict_entries();
}
// Variable content of the page
$aData['aPage'] = array_merge(
$aData['aPage'],