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

Rework efcd065 method of determining whether UIContentBlock needs a div tag

Browse Source
This commit is contained in:
Stephen Abello
2021-12-07 15:29:11 +01:00
parent bc349253cf
commit 0e36070f0a
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/csvimport.php
View File

@@ -638,12 +638,12 @@ try {
if ($bShouldConfirm) {
$sYesButton = Dict::S('UI:Button:Ok');
$sNoButton = Dict::S('UI:Button:Cancel');
$oDlg = UIContentBlockUIBlockFactory::MakeStandard("dlg_confirmation");
$oDlg = UIContentBlockUIBlockFactory::MakeStandard("dlg_confirmation")->SetHasForcedDiv(true);
$oPage->AddSubBlock($oDlg);
$oDlg->AddSubBlock(new Html($sMessage));
$oDlg->AddSubBlock(new Html(htmlentities(Dict::S('UI:CSVImportConfirmMessage'), ENT_QUOTES, 'UTF-8')));
$oDlgConfirm = UIContentBlockUIBlockFactory::MakeStandard("confirmation_chart");
$oDlgConfirm = UIContentBlockUIBlockFactory::MakeStandard("confirmation_chart")->SetHasForcedDiv(true);
$oDlg->AddSubBlock($oDlgConfirm);
$sDlgTitle = Dict::S('UI:CSVImportConfirmTitle');

17
sources/application/UI/Base/Layout/UIContentBlock.php
View File

@@ -31,7 +31,9 @@ class UIContentBlock extends UIBlock implements iUIContentBlock
/** @var array */
protected $aSubBlocks;
/** @var array */
protected $aDeferredBlocks;
protected $aDeferredBlocks;
/** @var array */
protected $bHasForcedDiv;
/**
* UIContentBlock constructor.
@@ -46,6 +48,7 @@ class UIContentBlock extends UIBlock implements iUIContentBlock
$this->aSubBlocks = [];
$this->aDeferredBlocks = [];
$this->bHasForcedDiv = false;
$this->SetCSSClasses($aContainerClasses);
}
@@ -197,5 +200,15 @@ class UIContentBlock extends UIBlock implements iUIContentBlock
return $this;
}
public function HasForcedDiv(): bool
{
return $this->bHasForcedDiv;
}
public function SetHasForcedDiv(bool $bHasForcedDiv)
{
$this->bHasForcedDiv = $bHasForcedDiv;
return $this;
}
}

2
templates/base/layouts/content-block/layout.html.twig
View File

@@ -3,7 +3,7 @@
{# Content Block #}
{% apply spaceless %}
{% set bHasDiv = (oUIBlock.GetAdditionalCSSClassesAsString() or oUIBlock.GetBlocksInheritanceCSSClassesAsString() or oUIBlock.GetDataAttributes() or oUIBlock.IsHidden()) %}
{% set bHasDiv = (oUIBlock.GetAdditionalCSSClassesAsString() or oUIBlock.GetDataAttributes() or oUIBlock.IsHidden() or oUIBlock.HasForcedDiv()) %}
{% block iboContentBlockContainer %}
{% if bHasDiv %}