From 6036d62d82600becf68991839af1e31122c4bc46 Mon Sep 17 00:00:00 2001 From: Stephan Brunker Date: Thu, 4 Jun 2020 23:48:12 +0200 Subject: [PATCH] media: added option to disable multiselection (still on by default) --- include/functions_images.inc.php | 1 + templates/2k11/admin/media_items.tpl | 2 +- templates/2k11/admin/serendipity_editor.js.tpl | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php index 7fcfdc59..633e428f 100644 --- a/include/functions_images.inc.php +++ b/include/functions_images.inc.php @@ -3242,6 +3242,7 @@ function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lin 'nr_files' => count($file), 'keywords' => explode(';', $serendipity['mediaKeywords']), 'thumbSize' => $serendipity['thumbSize'], + 'multiselect' => isset($serendipity['GET']['multiselect']) ? serendipity_db_bool($serendipity['GET']['multiselect']) : true, 'sortParams' => array('perpage', 'order', 'ordermode') ); diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl index 8fe433e2..e5cc8e77 100644 --- a/templates/2k11/admin/media_items.tpl +++ b/templates/2k11/admin/media_items.tpl @@ -65,7 +65,7 @@ {else} - {if NOT $media.manage} + {if NOT $media.manage && $media.multiselect}
diff --git a/templates/2k11/admin/serendipity_editor.js.tpl b/templates/2k11/admin/serendipity_editor.js.tpl index ad2dc009..d6921a52 100644 --- a/templates/2k11/admin/serendipity_editor.js.tpl +++ b/templates/2k11/admin/serendipity_editor.js.tpl @@ -168,7 +168,7 @@ // Opens media db image selection in new window serendipity.choose_media = function(id) { - serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[showUpload]=true&serendipity[htmltarget]=' + id + '&serendipity[filename_only]=true'); + serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[multiselect]=false&serendipity[showUpload]=true&serendipity[htmltarget]=' + id + '&serendipity[filename_only]=true'); } // "Transfer" value from media db popup to form element, used for example for selecting a category-icon @@ -1159,7 +1159,7 @@ $(function() { }); $('.wrap_insmedia').click(function() { - serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[showUpload]=true&serendipity[textarea]=' + $(this).attr('data-tarea')); + serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[multiselect]=true&serendipity[showUpload]=true&serendipity[textarea]=' + $(this).attr('data-tarea')); }); // Entry metadata