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

Allow strict media directory selection by toggle filter

Browse Source
This commit is contained in:
Ian 2015-10-15 18:43:01 +02:00
parent d130dc729e
commit 7554623cff
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/NEWS
View File

@ -1,6 +1,8 @@
Version 2.1 ()
------------------------------------------------------------------------
* Allow strict media directory selection by toggle filter
* Allow a better auto char conversion to media upload item names
* Added Start / End pagination to MediaLibrary and entries list

11
include/functions_images.inc.php
View File

@ -1450,6 +1450,14 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
$extraParems = serendipity_generateImageSelectorParems();
$rootDirStrict = false; // default
if (!isset($serendipity['COOKIE']['serendipity_toggle_dir'])) {
$serendipity['COOKIE']['serendipity_toggle_dir'] = 'no';
}
serendipity_restoreVar($serendipity['GET']['toggle_dir'], $serendipity['COOKIE']['serendipity_toggle_dir']);
if ($serendipity['GET']['toggle_dir'] == 'yes') {
$rootDirStrict = true;
}
$serendipity['GET']['only_path'] = serendipity_uploadSecure($limit_path . $serendipity['GET']['only_path'], true);
$serendipity['GET']['only_filename'] = serendipity_specialchars(str_replace(array('*', '?'), array('%', '_'), $serendipity['GET']['only_filename']));
@ -1601,7 +1609,8 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
(isset($serendipity['GET']['only_path']) ? $serendipity['GET']['only_path'] : ''),
(isset($serendipity['GET']['only_filename']) ? $serendipity['GET']['only_filename'] : ''),
(isset($serendipity['GET']['keywords']) ? $serendipity['GET']['keywords'] : ''),
(isset($serendipity['GET']['filter']) ? $serendipity['GET']['filter'] : '')
(isset($serendipity['GET']['filter']) ? $serendipity['GET']['filter'] : ''),
$rootDirStrict
);
$pages = ceil($totalImages / $perPage);

14
templates/2k11/admin/media_pane.tpl
View File

@ -1,3 +1,4 @@
<div class="has_toolbar">
<h2>{$CONST.MEDIA_LIBRARY}</h2>
@ -31,6 +32,19 @@
<label for="serendipity[filter][fileCategory][Video]" class="media_selector button_link">{$CONST.VIDEO}</label>
</fieldset>
</li>
<li id="media_dir_radio" class="media_select_strict">
<div class="clearfix">
<div class="form_radio">
<input id="radio_link_no" name="serendipity[toggle_dir]" type="radio" value="no" {'toggle_dir'|ifRemember:'no'}>
<label for="radio_link_no">Strict {$CONST.NO}</label>
</div>
<div class="form_radio">
<input id="radio_link_yes" name="serendipity[toggle_dir]" type="radio" value="yes" {'toggle_dir'|ifRemember:'yes':true}>
<label for="radio_link_yes">Strict {$CONST.YES}</label>
</div>
</div>
</li>
</ul>
<fieldset id="media_pane_filter" class="additional_info filter_pane">

10
templates/2k11/admin/style.css
View File

@ -2458,6 +2458,12 @@ input[name="serendipity[filter][fileCategory]"] {
margin: 1em 0 0;
}
.media_select_strict {
clear: right;
float: left;
margin: -0.75em 0px;
}
#overlay {
position: fixed;
top: 0;
@ -2994,6 +3000,10 @@ img.mfp-img {
margin: 0 0 1em;
}
.media_select_strict {
margin: -1em 0;
}
#mediaPropertyForm .media_file_props label,
#mediaPropertyForm header b,
#mediaPropertyForm footer b {