composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-03 16:14:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	core/config.class.inc.php
#	setup/itopdesignformat.class.inc.php
This commit is contained in:
Molkobain
2022-01-27 16:09:22 +01:00
parent 44c18395b3 b89d181125
commit 3bec96abe1
102 changed files with 986 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
View File

@@ -157,11 +157,11 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
}
if ($oDataTable->GetOption("select_mode") == 'multiple')
{
$sSubTitle =Dict::Format('UI:Pagination:HeaderSelection', $iCount, '<span class="ibo-datatable--selected-count">0</span>');
$sSubTitle =Dict::Format('UI:Pagination:HeaderSelection', '<span class="ibo-datatable--result-count">'.$iCount.'</span>', '<span class="ibo-datatable--selected-count">0</span>');
}
else
{
$sSubTitle = Dict::Format('UI:Pagination:HeaderNoSelection', $iCount);
$sSubTitle = Dict::Format('UI:Pagination:HeaderNoSelection', '<span class="ibo-datatable--result-count">'.$iCount.'</span>');
}
$oContainer->AddSubTitleBlock(new Html($sSubTitle));
if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){