diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 9a1453e84..d484cba04 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -5335,6 +5335,7 @@ EOF 'menu' => false, 'surround_with_panel' => true, 'panel_title' => $sSubtitle, + 'panel_title_is_html' => true, 'panel_icon' => MetaModel::GetClassIcon($sClass, false), 'panel_class' => $sClass, ))); diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 58de5924d..8e09c5337 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -268,6 +268,8 @@ class DisplayBlock 'surround_with_panel', /** string title of panel block */ 'panel_title', + /** string true if panel title should be displayed as html */ + 'panel_title_is_html', /** string class for panel block style */ 'panel_class', /** string class for panel block style */ diff --git a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php index cecdca883..784780c5d 100644 --- a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php +++ b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php @@ -16,6 +16,7 @@ use Combodo\iTop\Application\UI\Base\Component\CollapsibleSection\CollapsibleSec use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTable\FormTable; use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\FormTableRow\FormTableRow; use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\StaticTable; +use Combodo\iTop\Application\UI\Base\Component\Html\HtmlFactory; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory; @@ -141,8 +142,15 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory } else { $iCount = $oSet->Count(); } - $sTitle = (isset($aExtraParams['panel_title'])) ? $aExtraParams['panel_title'] : ""; - $oContainer = PanelUIBlockFactory::MakeForClass($oSet->GetClass(), $sTitle)->AddCSSClass('ibo-datatable-panel'); + $oContainer = PanelUIBlockFactory::MakeForClass($oSet->GetClass(), '')->AddCSSClass('ibo-datatable-panel'); + if(isset($aExtraParams['panel_title'])){ + if(isset($aExtraParams['panel_title_is_html']) && $aExtraParams['panel_title_is_html'] === true) { + $oContainer->AddTitleBlock(HtmlFactory::MakeRaw($aExtraParams['panel_title'])); + } + else { + $oContainer->SetTitle($aExtraParams['panel_title']); + } + } $oContainer->SetSubTitle(Dict::Format("UI:Pagination:HeaderNoSelection", $iCount)); if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){ $oContainer->SetIcon($aExtraParams["panel_icon"]);