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

N°2847 - Rework of Panel block

Browse Source 
- Add 2 separate content areas (main and toolbar)
- Improve HTML template with header
- Prepare ObjectDetails block based on a panel
This commit is contained in:
Molkobain
2020-10-01 22:41:10 +02:00
parent b3bb77c8ee
commit 15a9856f89
8 changed files with 299 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/application/WebPage/iTopWebPage.php
View File

@@ -19,7 +19,7 @@
use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
use Combodo\iTop\Application\UI\Component\Panel\Panel;
use Combodo\iTop\Application\UI\Component\Panel\PanelFactory;
use Combodo\iTop\Application\UI\iUIBlock;
use Combodo\iTop\Application\UI\Layout\iUIContentBlock;
use Combodo\iTop\Application\UI\Layout\NavigationMenu\NavigationMenuFactory;
@@ -1179,15 +1179,12 @@ EOF;
*/
public function AddTabContainer($sTabContainer, $sPrefix = '', iUIContentBlock $oParentBlock = null)
{
$oPanel = new Panel('');
// TODO 2.8.0 Change color according to object
$oPanel->SetColor(Panel::ENUM_COLOR_BLUE);
$oPanel->AddSubBlock($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
if (!is_null($oParentBlock)) {
$oParentBlock->AddSubBlock($oPanel);
} else {
$this->AddUiBlock($oPanel);
if(is_null($oParentBlock)) {
$oParentBlock = PanelFactory::MakeNeutral('');
$this->AddUiBlock($oParentBlock);
}
$oParentBlock->AddSubBlock($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
}
/**