From ddd473c3883562d95eb723ed9be12c07fea10173 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Fri, 5 Dec 2025 12:14:12 +0100 Subject: [PATCH 1/3] [Composer] Fixed license information --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5b7cf12e7c..78fd493fb0 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": { From 23d63d1e89412bf8e8fff211af5a9508e18108d9 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Fri, 5 Dec 2025 12:25:17 +0100 Subject: [PATCH 2/3] [Composer] Fixed license information --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 78fd493fb0..320e51ca25 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "ibexa/admin-ui", - "license": ["(GPL-2.0-only or proprietary)"], + "license": "(GPL-2.0-only or proprietary)", "type": "project", "description": "Ibexa Admin Ui", "replace": { From d6dd8142c4565b8bb0f3a532a8de8a1c41e6b0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksandra=20Bo=C5=BCek?= Date: Fri, 5 Dec 2025 12:55:19 +0100 Subject: [PATCH 3/3] IBX-11035: Hid all quick action buttons inside iframes (#1791) * IBX-11035: Hid all quick action buttons inside iframes * Wait until DOM is ready --- .../public/js/scripts/quick.action.manager.js | 17 +++++++++++++++-- .../public/scss/_quick-action-menu.scss | 5 +++++ src/bundle/Resources/public/scss/ibexa.scss | 1 + .../views/themes/admin/ui/layout.html.twig | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 src/bundle/Resources/public/scss/_quick-action-menu.scss 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 8701c2d7c7..d56a9195a1 100644 --- a/src/bundle/Resources/public/scss/ibexa.scss +++ b/src/bundle/Resources/public/scss/ibexa.scss @@ -98,6 +98,7 @@ @import 'main-container'; @import 'main-menu'; @import 'main-menu-popup'; +@import 'quick-action-menu'; @import 'edit-header'; @import 'context-menu'; @import '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 38bd4c4d45..6811056350 100644 --- a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig @@ -217,7 +217,7 @@ })|e('html_attr') }}">
-
+
{% if not is_back_to_top_disabled|default(false) %} {% block back_to_top %}