From 9728c3f10a8fe6165b5d9ad3af0e1fe6e8509ffd Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Thu, 24 Apr 2025 16:22:51 +0200 Subject: [PATCH] Make popup with picto simplest from modulebuiler or menu editor --- htdocs/admin/menus/edit.php | 4 ++-- htdocs/admin/tools/ui/class/documentation.class.php | 2 +- htdocs/admin/tools/ui/components/icons.php | 11 +++++++++-- htdocs/modulebuilder/index.php | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 7bd2ec4ba68..fd3961e81a5 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -396,7 +396,7 @@ if ($action == 'create') { print ''.$langs->trans('Example').': fa-globe-americas'; print ''; print '     '; - print dolButtonToOpenUrlInDialogPopup('popup_picto_id', $langs->transnoentitiesnoconv("DocIconsList"), $langs->transnoentitiesnoconv("DocIconsList"), '/admin/tools/ui/components/icons.php?displayMode=icon-only#img-picto-section-list', '', ''); + print dolButtonToOpenUrlInDialogPopup('popup_picto_id', $langs->transnoentitiesnoconv("DocIconsList"), $langs->transnoentitiesnoconv("DocIconsList"), '/admin/tools/ui/components/icons.php?hidenavmenu=1&displayMode=icon-only#img-picto-section-list', '', ''); print ''; print ''; @@ -529,7 +529,7 @@ if ($action == 'create') { print ''.$langs->trans('Example').': fa-globe-americas'; print ''; print '     '; - print dolButtonToOpenUrlInDialogPopup('popup_picto_id', $langs->transnoentitiesnoconv("DocIconsList"), $langs->transnoentitiesnoconv("DocIconsList"), '/admin/tools/ui/components/icons.php?displayMode=icon-only#img-picto-section-list', '', ''); + print dolButtonToOpenUrlInDialogPopup('popup_picto_id', $langs->transnoentitiesnoconv("DocIconsList"), $langs->transnoentitiesnoconv("DocIconsList"), '/admin/tools/ui/components/icons.php?hidenavmenu=1&displayMode=icon-only#img-picto-section-list', '', ''); print ''; print ''; diff --git a/htdocs/admin/tools/ui/class/documentation.class.php b/htdocs/admin/tools/ui/class/documentation.class.php index 0eae2e62ca2..60b9142a0eb 100644 --- a/htdocs/admin/tools/ui/class/documentation.class.php +++ b/htdocs/admin/tools/ui/class/documentation.class.php @@ -297,7 +297,7 @@ class Documentation /** * Output sidebar * - * @return void + * @return void */ public function showSidebar() { diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php index fb7aec592dc..89edcaae12e 100644 --- a/htdocs/admin/tools/ui/components/icons.php +++ b/htdocs/admin/tools/ui/components/icons.php @@ -57,11 +57,18 @@ $switchDisplayLink = dol_buildpath($documentation->baseUrl . '/components/icons. $switchDisplayLinkIcon = $displayMode == 'kanban' ? 'fa fa-th' : 'fa fa-th-list'; // Output sidebar -$documentation->showSidebar(); ?> +if (!GETPOST('hidenavmenu')) { + $documentation->showSidebar(); +} +?>
- showBreadCrumb(); ?> + showBreadCrumb(); + } + ?>
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 7a18daf28b0..7fe6b473e1f 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -3455,7 +3455,7 @@ if ($module == 'initmodule') { print ''; print '     '; - print dolButtonToOpenUrlInDialogPopup('popup_picto_id', $langs->transnoentitiesnoconv("DocIconsList"), $langs->transnoentitiesnoconv("DocIconsList"), '/admin/tools/ui/components/icons.php?displayMode=icon-only#img-picto-section-list', '', ''); + print dolButtonToOpenUrlInDialogPopup('popup_picto_id', $langs->transnoentitiesnoconv("DocIconsList"), $langs->transnoentitiesnoconv("DocIconsList"), '/admin/tools/ui/components/icons.php?hidenavmenu=1&displayMode=icon-only#img-picto-section-list', '', ''); print ''; print '
';