From 25d7c47ce332817b903b500cac4eec75fca41f7e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Apr 2025 05:47:47 +0200 Subject: [PATCH] WIP Enhance menu editor with showtopmenuinframe --- htdocs/admin/menus/edit.php | 12 ++++++++++++ htdocs/core/class/menubase.class.php | 5 +++++ htdocs/install/mysql/migration/21.0.0-22.0.0.sql | 2 ++ htdocs/install/mysql/tables/llx_menu.sql | 1 + htdocs/langs/en_US/admin.lang | 1 + 5 files changed, 21 insertions(+) diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index ec0385f7d84..e9b69e1947f 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -380,6 +380,12 @@ if ($action == 'create') { print ''.$langs->trans('URL').''; print ''.$langs->trans('DetailUrl').''; + // Show URL into a frame + if (getDolGlobalString("MAIN_SHOW_TOP_MENU_URL_IN_FRAME")) { + print ''.$langs->trans('ShowTopMenuURLIntoAFrame').''; + print ''; + } + // Picto print ''.$langs->trans('Image').''; print ''.$langs->trans('Example').': fa-global'; @@ -505,6 +511,12 @@ if ($action == 'create') { print ''.$langs->trans('URL').''; print ''.$langs->trans('DetailUrl').''; + // Show URL into a frame + if (getDolGlobalString("MAIN_SHOW_TOP_MENU_URL_IN_FRAME")) { + print ''.$langs->trans('ShowTopMenuURLIntoAFrame').''; + print ''; + } + // Picto print ''.$langs->trans('Image').''; print ''.$langs->trans('Example').': fa-global-america'; diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 06055f49926..2f43e4033b9 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -100,6 +100,11 @@ class Menubase */ public $url; + /** + * @var int 1=Allow to show the top menu URL into a frame + */ + public $showtopmenuinframe; + /** * @var string Target of Url link */ diff --git a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql index 7578fc26093..eacd4a7db95 100644 --- a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql +++ b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql @@ -244,3 +244,5 @@ ALTER TABLE llx_contratdet DROP COLUMN price_ht; ALTER TABLE llx_contratdet DROP COLUMN remise; ALTER TABLE llx_extrafields ADD COLUMN aiprompt text; + +ALTER TABLE llx_menu ADD COLUMN showtopmenuinframe integer DEFAULT 0; diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 60d7d067188..40f00f0348b 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -34,6 +34,7 @@ CREATE TABLE llx_menu fk_leftmenu varchar(100), -- position integer NOT NULL, -- Sort order of entry url TEXT NOT NULL, -- Relative (or absolute) url to go + showtopmenuinframe integer DEFAULT 0, -- 1=If url is an external url, can show the URL inside a frame target varchar(100) NULL, -- Target of Url link titre varchar(255) NOT NULL, -- Key for menu translation prefix varchar(255) NULL, -- picto diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 10f5dd12892..98051d3cad5 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2662,3 +2662,4 @@ MULTICURRENCY_APP_ENDPOINT=API endpoint URL to get live multicurrencies from a s NoWebsite=No website UploadName=Upload MAIN_SECURITY_MAXFILESIZE_DOWNLOADED=Max size of downloaded files +ShowTopMenuURLIntoAFrame=Show the top menu URL into a frame