diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 2520a029c..18818a7cd 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -270,6 +270,8 @@ class DisplayBlock 'panel_title', /** string class for panel block style */ 'panel_class', + /** string class for panel block style */ + 'panel_icon', ]; if (isset($aAllowedParams[$sStyle])) { @@ -1196,6 +1198,9 @@ JS $sTitle = Dict::Format($sFormat, $iTotalCount); $oBlock = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]); $oBlock->AddSubTitleBlock(new Html($sTitle)); + if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){ + $oBlock->SetIcon($aExtraParams["panel_icon"]); + } $oDataTable = DataTableUIBlockFactory::MakeForStaticData("", $aAttribs, $aData, null, $aExtraParams, $this->m_oFilter->ToOQL(), $aOption); $oBlock->AddSubBlock($oDataTable); } else { @@ -1212,6 +1217,9 @@ JS } if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) { $oBlock = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]); + if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){ + $oBlock->SetIcon($aExtraParams["panel_icon"]); + } $oBlock->AddSubBlock(new Html('

'.Dict::Format($sFormat, $iCount).'

')); } else { $oBlock = new Html('

'.Dict::Format($sFormat, $iCount).'

'); @@ -1347,6 +1355,9 @@ JS if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) { $oPanel = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]); + if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){ + $oPanel->SetIcon($aExtraParams["panel_icon"]); + } $oPanel->AddSubBlock($oBlock); return $oPanel; @@ -1544,6 +1555,9 @@ JS if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) { $oPanel = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]); + if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){ + $oPanel->SetIcon($aExtraParams["panel_icon"]); + } $oPanel->AddSubBlock($oBlock); return $oPanel; @@ -1632,6 +1646,9 @@ JS } if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) { $oPanel = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]); + if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){ + $oPanel->SetIcon($aExtraParams["panel_icon"]); + } $oPanel->AddSubBlock($oBlock); return $oPanel; diff --git a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php index 4008e0852..ac01b458e 100644 --- a/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php +++ b/sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php @@ -135,6 +135,9 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory $sTitle = (isset($aExtraParams['panel_title'])) ? $aExtraParams['panel_title'] : ""; $oContainer = PanelUIBlockFactory::MakeForClass($oSet->GetClass(), $sTitle)->AddCSSClass('ibo-datatable-panel'); $oContainer->SetSubTitle(Dict::Format("UI:Pagination:HeaderNoSelection", $iCount)); + if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){ + $oContainer->SetIcon($aExtraParams["panel_icon"]); + } $oContainer->AddToolbarBlock($oBlockMenu); $oContainer->AddMainBlock($oDataTable); } else {