mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Image selector toggled by showMediaToolbar

Browse Source 
And $media.manage in the templates
This commit is contained in:
onli
2014-01-23 23:33:23 +01:00
parent a6f0e97ed3
commit fa5af4a1ec
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/admin/images.inc.php
View File

@ -556,7 +556,8 @@ switch ($serendipity['GET']['adminAction']) {
'max_file_size' => $serendipity['maxFileSize'],
'maxImgHeight' => $serendipity['maxImgHeight'],
'maxImgWidth' => $serendipity['maxImgWidth'],
'extraParems' => serendipity_generateImageSelectorParems()
'extraParems' => serendipity_generateImageSelectorParems(),
'manage' => isset($serendipity['GET']['showMediaToolbar']) ? serendipity_db_bool($serendipity['GET']['showMediaToolbar']) : true
);
// ToDo later: merge $data and $media
$serendipity['smarty']->assign('media', $mediaFiles);

4
include/functions_images.inc.php
View File

@ -1432,7 +1432,7 @@ function serendipity_calculate_aspect_size($width, $height, $size, $constraint =
* @access public
* @param int The current page number
* @param string The HTML linebreak to use after a row of images
* @param boolean Should the toolbar for editing media files be shown?
* @param boolean Is this the ML-Version for managing everything (true), or is it about selecting one image for the editor? (false)
* @param string The URL to use for pagination
* @param boolean Show the "upload media item" feature?
* @param boolean Restrict viewing images to a specific directory
@ -1658,7 +1658,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
function serendipity_generateImageSelectorParems() {
global $serendipity;
$sortParams = array('perpage', 'order', 'ordermode');
$importParams = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage', 'keywords', 'noBanner', 'noSidebar', 'noFooter', 'showUpload');
$importParams = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage', 'keywords', 'noBanner', 'noSidebar', 'noFooter', 'showUpload','showMediaToolbar');
$extraParems = '';
$filterParams = array('only_path', 'only_filename');