From f4f846496bec024e20f21bd8219d62e36e710153 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Tue, 4 Aug 2020 13:49:11 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02847=20Add=20Separator=20item=20to=20pop?= =?UTF-8?q?over=20menu=20items?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/_popover-menu-item.scss | 9 +++++ lib/composer/autoload_classmap.php | 1 + lib/composer/autoload_static.php | 1 + .../PopoverMenuItemFactory.php | 4 +++ .../SeparatorPopoverMenuItem.php | 35 +++++++++++++++++++ .../item/mode_separator.html.twig | 4 +++ 6 files changed, 54 insertions(+) create mode 100644 sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php create mode 100644 templates/components/popover-menu/item/mode_separator.html.twig diff --git a/css/backoffice/components/_popover-menu-item.scss b/css/backoffice/components/_popover-menu-item.scss index e4a49e3b6..0fafce5ed 100644 --- a/css/backoffice/components/_popover-menu-item.scss +++ b/css/backoffice/components/_popover-menu-item.scss @@ -20,6 +20,10 @@ $ibo-popover-menu--item--text-color: $ibo-color-grey-900 !default; $ibo-popover-menu--item--hyperlink-color: $ibo-popover-menu--item--text-color !default; +$ibo-popover-menu--separator--padding: 0; +$ibo-popover-menu--separator--margin: 0; +$ibo-popover-menu--separator--background-color: $ibo-color-grey-200; + .ibo-popover-menu--item{ padding: 12px 24px 12px 16px; color: $ibo-popover-menu--item--text-color; @@ -31,4 +35,9 @@ $ibo-popover-menu--item--hyperlink-color: $ibo-popover-menu--item--text-color !d background-color: var(--ibo-color-grey-200); color: inherit; } + &.ibo-popover-menu--separator{ + padding: $ibo-popover-menu--separator--padding; + margin: $ibo-popover-menu--separator--margin; + background-color: $ibo-popover-menu--separator--background-color + } } diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 952d22524..a2c50090f 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -157,6 +157,7 @@ return array( 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\JsPopoverMenuItem' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php', 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItem' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php', 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItemFactory' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php', + 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\SeparatorPopoverMenuItem' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php', 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\UrlPopoverMenuItem' => $baseDir . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php', 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreate' => $baseDir . '/sources/application/UI/Component/QuickCreate/QuickCreate.php', 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreateFactory' => $baseDir . '/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 37a6be44a..f0e1c6118 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -387,6 +387,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\JsPopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/JsPopoverMenuItem.php', 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItem.php', 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\PopoverMenuItemFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php', + 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\SeparatorPopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php', 'Combodo\\iTop\\Application\\UI\\Component\\PopoverMenu\\PopoverMenuItem\\UrlPopoverMenuItem' => __DIR__ . '/../..' . '/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/UrlPopoverMenuItem.php', 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreate' => __DIR__ . '/../..' . '/sources/application/UI/Component/QuickCreate/QuickCreate.php', 'Combodo\\iTop\\Application\\UI\\Component\\QuickCreate\\QuickCreateFactory' => __DIR__ . '/../..' . '/sources/application/UI/Component/QuickCreate/QuickCreateFactory.php', diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php index 2ba5083db..6c3d1ea8c 100644 --- a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php +++ b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/PopoverMenuItemFactory.php @@ -24,6 +24,7 @@ namespace Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem; use ApplicationPopupMenuItem; use JSPopupMenuItem; use URLPopupMenuItem; +use SeparatorPopupMenuItem; /** * Class PopupMenuItemFactory @@ -52,6 +53,9 @@ class PopoverMenuItemFactory break; case $oItem instanceof JSPopupMenuItem: $sTargetClass = 'JsPopoverMenuItem'; + break; + case $oItem instanceof SeparatorPopupMenuItem: + $sTargetClass = 'SeparatorPopoverMenuItem'; break; default: $sTargetClass = 'PopoverMenuItem'; diff --git a/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php new file mode 100644 index 000000000..0b00f34bf --- /dev/null +++ b/sources/application/UI/Component/PopoverMenu/PopoverMenuItem/SeparatorPopoverMenuItem.php @@ -0,0 +1,35 @@ + + * @package Combodo\iTop\Application\UI\Component\PopoverMenu\PopoverMenuItem + * @property \SeparatorPopupMenuItem $oPopupMenuItem + * @since 2.8.0 + */ +class SeparatorPopoverMenuItem extends PopoverMenuItem +{ + const HTML_TEMPLATE_REL_PATH = 'components/popover-menu/item/mode_separator'; + +} \ No newline at end of file diff --git a/templates/components/popover-menu/item/mode_separator.html.twig b/templates/components/popover-menu/item/mode_separator.html.twig new file mode 100644 index 000000000..9e54f0d20 --- /dev/null +++ b/templates/components/popover-menu/item/mode_separator.html.twig @@ -0,0 +1,4 @@ +{% extends 'components/popover-menu/item/layout.html.twig' %} +{% block iboPopoverMenuItem %} +
+{% endblock %} \ No newline at end of file