composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-02 06:58:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pull up additionalCSSClasses from Button & UiContentBlock to UiBlock

Browse Source 
This will allow to use this everywhere !

Before this commit we had :
UiContentBlock
  aCSSClasses
  GetCssClasses
  SetCssClasses // reset + add, existing callers
  AddCSSClasses
Button
  $aAdditionalCSSClasses
  GetAdditionalCSSClass
  AddCSSClasses

Now we have :
UiBlock
  aAdditionalCSSClasses
  AddCSSClasses
  SetCSSClasses
  GetAdditionalCSSClass

Note that there were also some methods in PopoverMenuItem :
PopoverMenuItem
  SetCssClasses
  AddCssClass
  GetCssClasses
As they are indirection to methods in the $oPopupMenuItem attribute, I added to them the "MenuItem" prefix :
  SetMenuItemCssClasses
  AddMenuItemCssClass
  GetMenuItemCssClasses
Didn't find any use to change.
This commit is contained in:
Pierre Goiffon
2021-01-21 09:50:34 +01:00
parent 26f800d488
commit f723862def
12 changed files with 77 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sources/application/UI/Base/Component/Button/Button.php
View File

@@ -94,8 +94,6 @@ class Button extends UIBlock
protected $sJsCode;
/** @var string $sOnClickJsCode */
protected $sOnClickJsCode;
/** @var array */
protected $aAdditionalCSSClasses;
/**
* Button constructor.
@@ -131,7 +129,6 @@ class Button extends UIBlock
$this->sJsCode = $sJsCode;
$this->sOnClickJsCode = $sOnClickJsCode;
$this->bIsDisabled = false;
$this->aAdditionalCSSClasses = [];
$this->aDataAttributes = ['role' => 'ibo-button'];
}
@@ -346,24 +343,4 @@ class Button extends UIBlock
return $this;
}
/**
* @return string
*/
public function GetAdditionalCSSClass(): string
{
return implode(' ', $this->aAdditionalCSSClasses);
}
public function AddCSSClasses(string $sCSSClasses): self
{
foreach (explode(' ', $sCSSClasses) as $sCSSClass) {
if (!empty($sCSSClass)) {
$this->aAdditionalCSSClasses[$sCSSClass] = $sCSSClass;
}
}
return $this;
}
}

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 $sContainerCSSClass = '')
public function __construct(string $sRef, string $sContainerCSSClasses = '')
{
parent::__construct($sRef, $sContainerCSSClass);
parent::__construct($sRef, $sContainerCSSClasses);
$this->SetRef($sRef);
$this->aRows = [];
}

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

@@ -51,10 +51,10 @@ class StaticTable extends UIContentBlock
* ]
*/
private $aData;
public function __construct(string $sId = null, string $sContainerCSSClass = '')
public function __construct(string $sId = null, string $sContainerCSSClasses = '')
{
parent::__construct($sId, $sContainerCSSClass);
parent::__construct($sId, $sContainerCSSClasses);
$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 $sContainerClass = '')
public function __construct(string $sId = null, string $sContainerClasses = '')
{
parent::__construct($sId, $sContainerClass);
parent::__construct($sId, $sContainerClasses);
}
}

17
sources/application/UI/Base/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php
View File

@@ -69,13 +69,13 @@ class PopoverMenuItem extends UIBlock
}
/**
* @see \ApplicationPopupMenuItem::SetCssClasses()
*
* @param array $aCssClasses
*
* @return $this
* @uses oPopupMenuItem
* @uses \ApplicationPopupMenuItem::SetCssClasses()
*/
public function SetCssClasses(array $aCssClasses)
public function SetMenuItemCssClasses(array $aCssClasses)
{
$this->oPopupMenuItem->SetCssClasses($aCssClasses);
@@ -83,13 +83,13 @@ class PopoverMenuItem extends UIBlock
}
/**
* @see \ApplicationPopupMenuItem::AddCssClass()
*
* @param string $sCssClass
*
* @return $this
* @uses oPopupMenuItem
* @uses \ApplicationPopupMenuItem::AddCssClass()
*/
public function AddCssClass(string $sCssClass)
public function AddMenuItemCssClass(string $sCssClass)
{
$this->oPopupMenuItem->AddCssClass($sCssClass);
@@ -97,10 +97,11 @@ class PopoverMenuItem extends UIBlock
}
/**
* @see \ApplicationPopupMenuItem::GetCssClasses()
* @return array
* @uses oPopupMenuItem
* @uses \ApplicationPopupMenuItem::GetCssClasses()
*/
public function GetCssClasses()
public function GetMenuItemCssClasses(): array
{
return $this->oPopupMenuItem->GetCssClasses();
}