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

N°2847 - Datatable modal dialogs

Browse Source
This commit is contained in:
Eric
2020-11-19 17:45:46 +01:00
parent 26d912f059
commit 32e0c8f9bf
24 changed files with 541 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sources/application/WebPage/WebPage.php
View File

@@ -18,9 +18,11 @@
*/
use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
use Combodo\iTop\Application\UI\Component\Html\Html;
use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenu;
use Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuFactory;
use Combodo\iTop\Application\UI\iUIBlock;
use Combodo\iTop\Application\UI\Layout\iUIContentBlock;
use Combodo\iTop\Application\UI\Layout\UIContentBlock;
use Combodo\iTop\Renderer\BlockRenderer;
@@ -69,7 +71,7 @@ class WebPage implements Page
protected $bPrintable;
protected $bHasCollapsibleSection;
protected $bAddJSDict;
/** @var \Combodo\iTop\Application\UI\Layout\iUIContentBlock $oContentLayout */
/** @var iUIContentBlock $oContentLayout */
protected $oContentLayout;
protected $sTemplateRelPath;
@@ -170,9 +172,9 @@ class WebPage implements Page
* @param string $s_html
* @param string $sId
*/
public function add_at_the_end($s_html, $sId = '')
public function add_at_the_end($s_html, $sId = null)
{
$this->s_deferred_content .= $s_html;
$this->oContentLayout->AddDeferredBlock(new Html($s_html, $sId));
}
/**
@@ -711,7 +713,7 @@ class WebPage implements Page
* @throws \Twig\Error\RuntimeError
* @throws \Twig\Error\SyntaxError
*/
public function RenderInlineTemplatesRecursively(iUIBlock $oBlock): void
public function RenderInlineScriptsAndCSSRecursively(iUIBlock $oBlock): void
{
$oBlockRenderer = new BlockRenderer($oBlock);
$sInlineScript = trim($oBlockRenderer->RenderJsInline());
@@ -725,8 +727,23 @@ class WebPage implements Page
}
foreach ($oBlock->GetSubBlocks() as $oSubBlock) {
$this->RenderInlineTemplatesRecursively($oSubBlock);
$this->RenderInlineScriptsAndCSSRecursively($oSubBlock);
}
foreach ($oBlock->GetDeferredBlocks() as $oSubBlock) {
$this->RenderInlineScriptsAndCSSRecursively($oSubBlock);
}
}
public function GetDeferredBlocks(iUIBlock $oBlock): array
{
$aDeferredBlocks = $oBlock->GetDeferredBlocks();
foreach ($oBlock->GetSubBlocks() as $oSubBlock) {
$aDeferredBlocks = array_merge($aDeferredBlocks, $this->GetDeferredBlocks($oSubBlock));
}
return $aDeferredBlocks;
}
/**
@@ -745,6 +762,7 @@ class WebPage implements Page
$aData = [];
$aData['oLayout'] = $this->oContentLayout;
$aData['aDeferredBlocks'] = $this->GetDeferredBlocks($this->oContentLayout);
// CSS files
foreach ($this->oContentLayout->GetCssFilesUrlRecursively(true) as $sFileAbsUrl) {
@@ -756,7 +774,7 @@ class WebPage implements Page
}
// Inline Templates
$this->RenderInlineTemplatesRecursively($this->oContentLayout);
$this->RenderInlineScriptsAndCSSRecursively($this->oContentLayout);
// Base structure of data to pass to the TWIG template
$aData['aPage'] = [