diff --git a/composer.json b/composer.json index cc0b39f45d..7f240ca0fb 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "ibexa/admin-ui", - "license": "GPL-2.0-only", + "license": "(GPL-2.0-only or proprietary)", "type": "project", "description": "Ibexa Admin Ui", "replace": { diff --git a/src/bundle/Resources/public/js/scripts/quick.action.manager.js b/src/bundle/Resources/public/js/scripts/quick.action.manager.js index 9dfb65413f..e22f1f9582 100644 --- a/src/bundle/Resources/public/js/scripts/quick.action.manager.js +++ b/src/bundle/Resources/public/js/scripts/quick.action.manager.js @@ -1,7 +1,20 @@ -(function (global) { +(function (global, doc) { const ACTION_BTN_VERTICAL_SPACING = 4.3; + const isIframe = global.self !== global.top; let actionButtonConfigs = []; + const handleQuickActionMenuVisibility = () => { + if (!isIframe) { + const quickActionMenu = doc.querySelector('.ibexa-quick-action-menu'); + + if (quickActionMenu) { + quickActionMenu.classList.remove('ibexa-quick-action-menu--hidden'); + } + } + }; + + doc.addEventListener('DOMContentLoaded', handleQuickActionMenuVisibility, false); + const registerButton = (config) => { if (!config || !config.container || actionButtonConfigs.some((btn) => btn.id === config.id)) { return; @@ -49,4 +62,4 @@ unregisterButton, recalculateButtonsLayout, }; -})(window); +})(window, window.document); diff --git a/src/bundle/Resources/public/scss/_quick-action-menu.scss b/src/bundle/Resources/public/scss/_quick-action-menu.scss new file mode 100644 index 0000000000..adfedd9a86 --- /dev/null +++ b/src/bundle/Resources/public/scss/_quick-action-menu.scss @@ -0,0 +1,5 @@ +.ibexa-quick-action-menu { + &--hidden { + display: none; + } +} diff --git a/src/bundle/Resources/public/scss/ibexa.scss b/src/bundle/Resources/public/scss/ibexa.scss index fea8a9b9c8..a83bb395ab 100644 --- a/src/bundle/Resources/public/scss/ibexa.scss +++ b/src/bundle/Resources/public/scss/ibexa.scss @@ -96,6 +96,7 @@ @use 'main-container'; @use 'main-menu'; @use 'main-menu-popup'; +@use 'quick-action-menu'; @use 'edit-header'; @use 'context-menu'; @use 'anchor-navigation'; diff --git a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig index 7bd4d2168d..d1615859fe 100644 --- a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig @@ -216,7 +216,7 @@ })|e('html_attr') }}">
-
+
{% if not is_back_to_top_disabled|default(false) %} {% block back_to_top %}