composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-01 22:48:45 +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

2
sources/application/UI/Base/Component/Badge/Badge.php
View File

@@ -17,7 +17,7 @@ class Badge extends UIContentBlock
public function __construct(string $sColor)
{
parent::__construct(null, "ibo-badge ibo-badge-is-{$sColor}");
parent::__construct(null, ["ibo-badge ibo-badge-is-{$sColor}"]);
$this->SetColor($sColor);
}

2
sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
View File

@@ -114,7 +114,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
}
if (!isset($aExtraParams['surround_with_panel']) || $aExtraParams['surround_with_panel']) {
$oContainer = PanelUIBlockFactory::MakeForClass($oSet->GetClass(), "Result")->AddCSSClasses('ibo-datatable-panel');
$oContainer = PanelUIBlockFactory::MakeForClass($oSet->GetClass(), "Result")->AddCSSClass('ibo-datatable-panel');
$oContainer->AddToolbarBlock($oBlockMenu);
$oContainer->AddMainBlock($oDataTable);
} else {

4
sources/application/UI/Base/Component/DataTable/StaticTable/FormTable/FormTable.php
View File

@@ -29,9 +29,9 @@ class FormTable extends StaticTable
/** @var iUIBlock[] */
private $aRows;
public function __construct(string $sRef, string $sContainerCSSClasses = '')
public function __construct(string $sRef, array $aContainerCSSClasses = [])
{
parent::__construct($sRef, $sContainerCSSClasses);
parent::__construct($sRef, $aContainerCSSClasses);
$this->SetRef($sRef);
$this->aRows = [];
}

4
sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php
View File

@@ -52,9 +52,9 @@ class StaticTable extends UIContentBlock
*/
private $aData;
public function __construct(string $sId = null, string $sContainerCSSClasses = '')
public function __construct(string $sId = null, array $aContainerCSSClasses = [])
{
parent::__construct($sId, $sContainerCSSClasses);
parent::__construct($sId, $aContainerCSSClasses);
$this->aColumns = [];
$this->aData = [];
}

4
sources/application/UI/Base/Component/FieldBadge/FieldBadge.php
View File

@@ -19,8 +19,8 @@ class FieldBadge extends UIContentBlock
// Overloaded constants
public const BLOCK_CODE = 'ibo-field-badge';
public function __construct(string $sId = null, string $sContainerClasses = '')
public function __construct(string $sId = null, array $aContainerClasses = [])
{
parent::__construct($sId, $sContainerClasses);
parent::__construct($sId, $aContainerClasses);
}
}

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;");