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

Correctly handle separators

Browse Source
This commit is contained in:
Stephen Abello
2026-08-21 14:53:04 +02:00
parent 7e3b4af093
commit 0e7e87ff8b
18 changed files with 255 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
css/backoffice/components/_all.scss
View File

@@ -5,6 +5,7 @@
@import "alert";
@import "button";
@import "button-separator";
@import "button-group";
@import "breadcrumbs";
@import "quick-create";

20
css/backoffice/components/_button-separator.scss Normal file
View File

@@ -0,0 +1,20 @@
/*
* @copyright Copyright (C) 2010-2026 Combodo SAS
* @license http://opensource.org/licenses/AGPL-3.0
*/
$ibo-button-separator--width: 1px !default;
$ibo-button-separator--height: 16px !default;
$ibo-button-separator--margin-x: 0.75rem !default;
$ibo-button-separator--margin-y: $ibo-spacing-0 !default;
$ibo-button-separator--border-size: 1px !default;
$ibo-button-separator--border-color: $ibo-color-grey-500 !default;
.ibo-button-separator {
display: inline-flex;
border-right: $ibo-button-separator--border-size solid $ibo-button-separator--border-color;
width: $ibo-button-separator--width;
height: $ibo-button-separator--height;
margin: $ibo-button-separator--margin-y $ibo-button-separator--margin-x;
}

7
css/backoffice/components/_field.scss
View File

@@ -267,14 +267,19 @@ $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !default;
}
.ibo-field--label {
.ibo-field--action {
.ibo-field--action:not(.ibo-button-separator) {
width: 20px;
height: 20px;
padding: 0;
border-radius: $ibo-field--fullscreen-toggler--border-radius;
font-size: $ibo-font-size-50;
vertical-align: center;
~ .ibo-field--action {
margin-left: 2px;
}
}
.ibo-field--action.ibo-button-separator {
margin: 0 2px;
vertical-align: center;
}
}

11
css/backoffice/layout/activity-panel/_activity-action.scss
View File

@@ -13,6 +13,9 @@ $ibo-activity-panel--activity-action--icon--height: 100% !default;
$ibo-activity-panel--activity-action--icon--width: $ibo-activity-panel--activity-action--icon--height !default;
$ibo-activity-panel--activity-action--icon--font-size: $ibo-font-size-200 !default;
$ibo-activity-panel--activity-action--icon--line-height: 33px !default;
$ibo-activity-panel--activity-action-separator--width: 24px !default;
$ibo-activity-panel--activity-action-separator--height: 1px !default;
$ibo-activity-panel--activity-action-separator--background-color: $ibo-color-grey-500 !default;
.ibo-activity-panel--activity-actions {
@@ -60,3 +63,11 @@ $ibo-activity-panel--activity-action--icon--line-height: 33px !default;
display: none;
}
}
.ibo-activity-panel--activity-action-separator {
display: block;
width: $ibo-activity-panel--activity-action-separator--width;
height: $ibo-activity-panel--activity-action-separator--height;
margin: auto;
background-color: $ibo-activity-panel--activity-action-separator--background-color;
}

4
css/backoffice/layout/activity-panel/_caselog-entry-form.scss
View File

@@ -59,4 +59,8 @@ $ibo-caselog-entry-form--lock-message--margin-left: 1rem !default;
}
.ibo-caselog-entry-form--action-buttons--main-actions > .ibo-popover-menu {
z-index: 1;
}
.ibo-caselog-entry-form--action-buttons--extra-actions .ibo-button-separator{
vertical-align: center ;
}

6
css/backoffice/layout/top-bar/_top-bar-action.scss
View File

@@ -27,4 +27,10 @@ $ibo-top-bar-quick-action--icon--color--on-active: $ibo-color-primary-800 !defau
&:active{
color: $ibo-top-bar-quick-action--icon--color--on-active;
}
}
.ibo-top-bar-quick-action-separator {
width: 2px;
background-color: $ibo-color-grey-300;
margin: 0 8px;
}

3
lib/composer/autoload_classmap.php
View File

@@ -169,6 +169,7 @@ return array(
'Combodo\\iTop\\Application\\UI\\Base\\Component\\ButtonGroup\\ButtonGroupUIBlockFactory' => $baseDir . '/sources/Application/UI/Base/Component/ButtonGroup/ButtonGroupUIBlockFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\Button' => $baseDir . '/sources/Application/UI/Base/Component/Button/Button.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonJS' => $baseDir . '/sources/Application/UI/Base/Component/Button/ButtonJS.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonSeparator' => $baseDir . '/sources/Application/UI/Base/Component/Button/ButtonSeparator.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonUIBlockFactory' => $baseDir . '/sources/Application/UI/Base/Component/Button/ButtonUIBlockFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonURL' => $baseDir . '/sources/Application/UI/Base/Component/Button/ButtonURL.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\CollapsibleSection\\CollapsibleSection' => $baseDir . '/sources/Application/UI/Base/Component/CollapsibleSection/CollapsibleSection.php',
@@ -275,6 +276,7 @@ return array(
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelAction' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelAction.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelActionFactory' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelActionJS' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionJS.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelActionSeparator' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionSeparator.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelActionURL' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionURL.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelFactory' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelHelper' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php',
@@ -305,6 +307,7 @@ return array(
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickAction' => $baseDir . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickAction.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickActionFactory' => $baseDir . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickActionJS' => $baseDir . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionJS.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickActionSeparator' => $baseDir . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionSeparator.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickActionURL' => $baseDir . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionURL.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarFactory' => $baseDir . '/sources/Application/UI/Base/Layout/TopBar/TopBarFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\UIContentBlock' => $baseDir . '/sources/Application/UI/Base/Layout/UIContentBlock.php',

3
lib/composer/autoload_static.php
View File

@@ -570,6 +570,7 @@ class ComposerStaticInitfc0e9e9dea11dcbb6272414776c30685
'Combodo\\iTop\\Application\\UI\\Base\\Component\\ButtonGroup\\ButtonGroupUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/ButtonGroup/ButtonGroupUIBlockFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\Button' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Button/Button.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonJS' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Button/ButtonJS.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonSeparator' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Button/ButtonSeparator.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Button/ButtonUIBlockFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\Button\\ButtonURL' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Button/ButtonURL.php',
'Combodo\\iTop\\Application\\UI\\Base\\Component\\CollapsibleSection\\CollapsibleSection' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/CollapsibleSection/CollapsibleSection.php',
@@ -676,6 +677,7 @@ class ComposerStaticInitfc0e9e9dea11dcbb6272414776c30685
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelAction' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelAction.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelActionFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelActionJS' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionJS.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelActionSeparator' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionSeparator.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelAction\\ActivityPanelActionURL' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionURL.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelHelper' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php',
@@ -706,6 +708,7 @@ class ComposerStaticInitfc0e9e9dea11dcbb6272414776c30685
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickAction' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickAction.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickActionFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickActionJS' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionJS.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickActionSeparator' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionSeparator.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarAction\\TopBarQuickActionURL' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionURL.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\TopBar\\TopBarFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/TopBar/TopBarFactory.php',
'Combodo\\iTop\\Application\\UI\\Base\\Layout\\UIContentBlock' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/UIContentBlock.php',

37
sources/Application/UI/Base/Component/Button/ButtonSeparator.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
/**
* Copyright (C) 2013-2026 Combodo SAS
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
namespace Combodo\iTop\Application\UI\Base\Component\Button;
use Combodo\iTop\Application\UI\Base\UIBlock;
/**
* Class ButtonSeparator
*
* @internal
* @since 3.3.0
*/
class ButtonSeparator extends UIBlock
{
public const BLOCK_CODE = 'ibo-button-separator';
public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/button/separator/layout';
public const DEFAULT_JS_TEMPLATE_REL_PATH = null;
}

32
sources/Application/UI/Base/Component/Button/ButtonUIBlockFactory.php
View File

@@ -20,9 +20,11 @@
namespace Combodo\iTop\Application\UI\Base\Component\Button;
use ApplicationPopupMenuItem;
use Combodo\iTop\Application\UI\Base\AbstractUIBlockFactory;
use Dict;
use JSPopupMenuItem;
use SeparatorPopupMenuItem;
use URLPopupMenuItem;
use utils;
@@ -378,7 +380,14 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
return $oButton;
}
public static function MakeIconButtonFromApplicationPopupMenuItem($oPopupItem, $sColor = Button::ENUM_COLOR_SCHEME_NEUTRAL, $sActionType = Button::ENUM_ACTION_TYPE_ALTERNATIVE)
/**
* @param ApplicationPopupMenuItem $oPopupItem
* @param string $sColor
* @param string $sActionType
*
* @return \Combodo\iTop\Application\UI\Base\Component\Button\Button|\Combodo\iTop\Application\UI\Base\Component\Button\ButtonSeparator|null
*/
public static function MakeIconButtonFromApplicationPopupMenuItem(ApplicationPopupMenuItem $oPopupItem, $sColor = Button::ENUM_COLOR_SCHEME_NEUTRAL, $sActionType = Button::ENUM_ACTION_TYPE_ALTERNATIVE): Button|ButtonSeparator|null
{
if ($oPopupItem instanceof JSPopupMenuItem) {
$sTooltip = $oPopupItem->GetTooltip();
@@ -416,14 +425,25 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
$oButton->SetColor($sColor);
return $oButton;
} elseif ($oPopupItem instanceof SeparatorPopupMenuItem) {
$oSeparator = new ButtonSeparator($oPopupItem->GetUID());
$oSeparator->SetCSSClasses($oPopupItem->GetCssClasses());
return $oSeparator;
}
//TODO How to handle other types of ApplicationPopupMenuItem? For now, we return null.
// Should never happen, but just in case a new type is added, return null
return null;
}
public static function MakeButtonFromApplicationPopupMenuItem($oPopupItem, $sColor = Button::ENUM_COLOR_SCHEME_NEUTRAL, $sActionType = Button::ENUM_ACTION_TYPE_ALTERNATIVE)
/**
* @param ApplicationPopupMenuItem $oPopupItem
* @param string $sColor
* @param string $sActionType
*
* @return \Combodo\iTop\Application\UI\Base\Component\Button\Button|\Combodo\iTop\Application\UI\Base\Component\Button\ButtonSeparator|null
*/
public static function MakeButtonFromApplicationPopupMenuItem(ApplicationPopupMenuItem $oPopupItem, $sColor = Button::ENUM_COLOR_SCHEME_NEUTRAL, $sActionType = Button::ENUM_ACTION_TYPE_ALTERNATIVE): Button|ButtonSeparator|null
{
if ($oPopupItem instanceof JSPopupMenuItem) {
$oButton = self::MakeForAction(
@@ -466,9 +486,13 @@ class ButtonUIBlockFactory extends AbstractUIBlockFactory
}
return $oButton;
} elseif ($oPopupItem instanceof SeparatorPopupMenuItem) {
$oSeparator = new ButtonSeparator($oPopupItem->GetUID());
$oSeparator->SetCSSClasses($oPopupItem->GetCssClasses());
return $oSeparator;
}
//TODO How to handle other types of ApplicationPopupMenuItem? For now, we return null.
// Should never happen, but just in case a new type is added, return null
return null;
}

2
sources/Application/UI/Base/Component/Field/FieldUIBlockFactory.php
View File

@@ -72,7 +72,7 @@ class FieldUIBlockFactory extends AbstractUIBlockFactory
if (isset($aParams['actions'])) {
//TODO make this a configuration parameter
$iMaxActions = 2;
$iMaxActions = 50;
$aActions = [];
// Create a button for a few action or a kebab button for multiple actions that a more than what's configured
if (count($aParams['actions']) > $iMaxActions) {

29
sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionFactory.php
View File

@@ -24,6 +24,7 @@ use ApplicationPopupMenuItem;
use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu;
use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\PopoverMenuItemFactory;
use JSPopupMenuItem;
use SeparatorPopupMenuItem;
use URLPopupMenuItem;
/**
@@ -61,26 +62,38 @@ class ActivityPanelActionFactory
$aSectionPopupItems = [$aSectionPopupItems];
}
// Special index as separators aren't meant to be multiple action across different caselogs
$iSectionSeparatorIndex = 0;
foreach ($aSectionPopupItems as $oPopupItem) {
if (!$oPopupItem instanceof ApplicationPopupMenuItem) {
continue;
}
$sUid = $oPopupItem->GetUID();
if ($oPopupItem instanceof SeparatorPopupMenuItem) {
$iSectionSeparatorIndex++;
$sUid = 'ibo-activity-panel--activity-action-separator--'.$iSectionSeparatorIndex;
}
if (!isset($aActionsByUid[$sUid])) {
$oActivityAction = static::MakeFromApplicationPopupItem($oPopupItem);
if ($oActivityAction === null) {
continue;
}
$oPopoverMenu = new PopoverMenu($oActivityAction->GetId().'-menu');
$oPopoverMenu->SetContainer(PopoverMenu::ENUM_CONTAINER_BODY);
$oPopoverMenu->SetTogglerFromBlock($oActivityAction);
$oActivityAction->SetPopoverMenu($oPopoverMenu);
if (false === ($oActivityAction instanceof ActivityPanelActionSeparator)) {
$oPopoverMenu = new PopoverMenu($oActivityAction->GetId().'-menu');
$oPopoverMenu->SetContainer(PopoverMenu::ENUM_CONTAINER_BODY);
$oPopoverMenu->SetTogglerFromBlock($oActivityAction);
$oActivityAction->SetPopoverMenu($oPopoverMenu);
}
$aActionsByUid[$sUid] = $oActivityAction;
}
if ($aActionsByUid[$sUid] instanceof ActivityPanelActionSeparator) {
continue;
}
$oPopupItemForPopoverMenuItem = clone $oPopupItem;
$oPopupItemForPopoverMenuItem->SetLabel($sSectionLabel);
$oPopupItemForPopoverMenuItem->SetIconClass('');
@@ -108,9 +121,7 @@ class ActivityPanelActionFactory
$oAction->SetIncludeJSFiles($oPopupItem->GetLinkedScripts());
return $oAction;
}
if ($oPopupItem instanceof URLPopupMenuItem) {
} elseif ($oPopupItem instanceof URLPopupMenuItem) {
$oAction = new ActivityPanelActionURL(
$oPopupItem->GetLabel(),
$oPopupItem->GetIconClass(),
@@ -121,9 +132,11 @@ class ActivityPanelActionFactory
$oAction->SetTarget($oPopupItem->GetTarget());
return $oAction;
} elseif ($oPopupItem instanceof SeparatorPopupMenuItem) {
return new ActivityPanelActionSeparator($oPopupItem->GetUID());
}
//TODO How to handle other types of ApplicationPopupMenuItem? For now, we return null.
// Should never happen, but just in case a new type is added, return null
return null;
}

43
sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelAction/ActivityPanelActionSeparator.php Normal file
View File

@@ -0,0 +1,43 @@
<?php
/**
* Copyright (C) 2013-2026 Combodo SAS
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
namespace Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityPanelAction;
/**
* Class ActivityPanelActionSeparator
*
* @package Combodo\iTop\Application\UI\Base\Layout\ActivityPanel\ActivityPanelAction
* @internal
* @since 3.3.0
*/
class ActivityPanelActionSeparator extends ActivityPanelAction
{
public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/activity-panel/activity-action/activity-action-separator';
public const DEFAULT_JS_TEMPLATE_REL_PATH = null;
/**
* @param string|null $sId
*/
public function __construct(?string $sId = null)
{
parent::__construct('', '', null, $sId);
}
}

9
sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionFactory.php
View File

@@ -21,6 +21,7 @@
namespace Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBarAction;
use JSPopupMenuItem;
use SeparatorPopupMenuItem;
use URLPopupMenuItem;
/**
@@ -32,7 +33,7 @@ use URLPopupMenuItem;
*/
class TopBarQuickActionFactory
{
public static function MakeFromApplicationPopupItem($oApplicationPopupItem)
public static function MakeFromApplicationPopupItem($oApplicationPopupItem): ?TopBarQuickAction
{
if ($oApplicationPopupItem instanceof JSPopupMenuItem) {
$oTopBarAction = new TopBarQuickActionJS(
@@ -56,9 +57,13 @@ class TopBarQuickActionFactory
$oTopBarAction->SetUrl($oApplicationPopupItem->GetUrl());
$oTopBarAction->SetTarget($oApplicationPopupItem->GetTarget());
return $oTopBarAction;
} elseif ($oApplicationPopupItem instanceof SeparatorPopupMenuItem) {
$oTopBarAction = new TopBarQuickActionSeparator($oApplicationPopupItem->GetUID());
$oTopBarAction->SetCSSClasses($oApplicationPopupItem->GetCssClasses());
return $oTopBarAction;
}
//TODO How to handle other types of ApplicationPopupMenuItem? For now, we return null.
// Should never happen, but just in case a new type is added, return null
return null;
}
}

45
sources/Application/UI/Base/Layout/TopBar/TopBarQuickAction/TopBarQuickActionSeparator.php Normal file
View File

@@ -0,0 +1,45 @@
<?php
/**
* Copyright (C) 2013-2026 Combodo SAS
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
namespace Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBarAction;
/**
* Class TopBarQuickActionSeparator
*
* @package Combodo\iTop\Application\UI\Base\Layout\TopBar\TopBarAction
* @internal
* @since 3.3.0
*/
class TopBarQuickActionSeparator extends TopBarQuickAction
{
public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/layouts/top-bar/top-bar-quick-action/top-bar-quick-action-separator';
public const DEFAULT_JS_TEMPLATE_REL_PATH = null;
/**
* @param string|null $sId
*
* @throws \CoreException
* @throws \DictExceptionMissingString
*/
public function __construct(?string $sId = null)
{
parent::__construct('', '', null, $sId);
}
}

11
templates/base/components/button/separator/layout.html.twig Normal file
View File

@@ -0,0 +1,11 @@
{# @copyright Copyright (C) 2010-2026 Combodo SAS #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
{% apply spaceless %}
<span id="{{ oUIBlock.GetId() }}"
class="{{ oUIBlock.GetBlocksInheritanceCSSClassesAsString() }}
{% if oUIBlock.GetAdditionalCSSClassesAsString() %}{{ oUIBlock.GetAdditionalCSSClassesAsString() }}{% endif %}
{% if oUIBlock.IsHidden() %}ibo-is-hidden{% endif %}"
data-role="ibo-button-separator">
</span>
{% endapply %}

4
templates/base/layouts/activity-panel/activity-action/activity-action-separator.html.twig Normal file
View File

@@ -0,0 +1,4 @@
<span id="{{ oUIBlock.GetId() }}"
class="{{ oUIBlock.GetBlocksInheritanceCSSClassesAsString() }} {{ oUIBlock.GetAdditionalCSSClassesAsString() }} ibo-activity-panel--activity-action-separator"
data-role="ibo-activity-panel--activity-action-separator">
</span>

4
templates/base/layouts/top-bar/top-bar-quick-action/top-bar-quick-action-separator.html.twig Normal file
View File

@@ -0,0 +1,4 @@
<div id="{{ oUIBlock.GetId() }}"
class="ibo-top-bar-quick-action ibo-top-bar-quick-action-separator"
data-role="ibo-top-bar-quick-action-separator">
</div>