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

UIBlock: Change $aAdditionalCSSClasses methods to match app. conventions (parameters should be arrays, not space separated string)

Browse Source 
Note: This had to be fixed on all calls to this, hence the number of modifications.
This commit is contained in:
Molkobain
2021-01-21 12:40:30 +01:00
parent 7c8019319a
commit 1514cd83ab
28 changed files with 152 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/application/UI/Base/Component/FieldBadge/FieldBadgeUIBlockFactory.php
View File

@@ -30,7 +30,8 @@ class FieldBadgeUIBlockFactory extends AbstractUIBlockFactory
$sPrimaryColor = $oStyle->GetMainColor();
$sComplementaryColor = $oStyle->GetComplementaryColor();
if (!is_null($sPrimaryColor) && !is_null($sComplementaryColor)) {
$oBadge = new FieldBadge(null, $sStyleClass.' ibo-field-badge');
$aCSSClasses = array_merge(explode(' ', $sStyleClass), ['ibo-field-badge']);
$oBadge = new FieldBadge(null, $aCSSClasses);
$sDecorationClasses = $oStyle->GetDecorationClasses();
if (!is_null($sDecorationClasses)) {
$oBadge->AddHtml("<i class=\"$sDecorationClasses\"></i>&nbsp;");