Merge branch '2.0' of github.com:s9y/Serendipity into 2.0
This commit is contained in:
Matthias Mees
commit
8d72e632cc
@ -3,7 +3,7 @@
|
||||
<div class="has_toolbar">
|
||||
<h2>{$CONST.FIND_MEDIA}</h2>
|
||||
|
||||
<form method="get" action="?">
|
||||
<form id="media_library_control" method="get" action="?">
|
||||
{$media.token}
|
||||
{$media.form_hidden}
|
||||
<ul class="filters_toolbar plainList">
|
||||
@ -12,19 +12,64 @@
|
||||
{if $media.show_upload}
|
||||
<li><input type="button" value="{$CONST.ADD_MEDIA|@escape}" onclick="location.href='{$media.url}&serendipity[adminAction]=addSelect&serendipity[only_path]={$media.only_path|escape:url}'; return false"></li>
|
||||
{/if}
|
||||
<li><input type="radio" id="serendipity[filter][fileCategory][All]" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == ""}checked{/if} value=""></input>
|
||||
<label for="serendipity[filter][fileCategory][All]" class="media_selector button_link">All</label>
|
||||
<input id="serendipity[filter][fileCategory][Image]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "image"}checked{/if} value="image"></input>
|
||||
<label for="serendipity[filter][fileCategory][Image]" class="media_selector button_link">{$CONST.IMAGE}</label>
|
||||
<input id="serendipity[filter][fileCategory][Video]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "video"}checked{/if} value="video"></input>
|
||||
<label for="serendipity[filter][fileCategory][Video]" class="media_selector button_link">{$CONST.VIDEO}</label>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<fieldset id="media_pane_filter" class="additional_info">
|
||||
<legend class="visuallyhidden">{$CONST.FILTERS}</legend>
|
||||
|
||||
<div id="media_filter" class="clearfix">
|
||||
{foreach from=$media.sort_order item="so_val" key="so_key"}
|
||||
<div class="{cycle values="left,center,right"}">
|
||||
{if $so_val.type == 'date' || $so_val.type == 'intrange'}
|
||||
<fieldset>
|
||||
<legend><span>{$CONST.SORT_BY} ({$so_key})</span></legend>
|
||||
{else}
|
||||
<div class="form_{if $so_val.type == 'authors'}select{else}field{/if}">
|
||||
<label for="serendipity_filter_{$so_key}">{$so_val.desc}</label>
|
||||
{/if}
|
||||
{if $so_val.type == 'date'}
|
||||
{if $media.filter[$so_key].from != '' OR $media.filter[$so_key].to != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
|
||||
<div class="form_field">
|
||||
{* Core might need to be adapted to input[type=date] *}
|
||||
{* date is not ideal, should be datetime – but datetime isn't properly supported *}
|
||||
{* by browsers yet, so we probably need a JS widget (jQuery UI?) for this … *}
|
||||
<label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">From</label> {* i18n *}
|
||||
<input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="date" value="{$media.filter[$so_key].from|@escape}">
|
||||
-
|
||||
<label for="serendipity_filter_{$so_key}_to" class="visuallyhidden">To</label> {* i18n *}
|
||||
<input id="serendipity_filter_{$so_key}_to" name="serendipity[filter][{$so_key}][to]" type="date" value="{$media.filter[$so_key].to|@escape}">
|
||||
{* <span class="input_hint">(DD.MM.YYYY | YYYY-MM-DD | MM/DD/YYYY)</span> *}
|
||||
</div>
|
||||
{elseif $so_val.type == 'intrange'}
|
||||
{if $media.filter[$so_key].from != '' OR $media.filter[$so_key].to != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
|
||||
<div class="form_field">
|
||||
{* Could also use input[type=range]; unsure if that's actually useful (yet) *}
|
||||
<label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">From</label> {* i18n *}
|
||||
<input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="text" value="{$media.filter[$so_key].from|@escape}">
|
||||
-
|
||||
<label for="serendipity_filter_{$so_key}_to" class="visuallyhidden">To</label> {* i18n *}
|
||||
<input id="serendipity_filter_{$so_key}_to" name="serendipity[filter][{$so_key}][to]" type="text" value="{$media.filter[$so_key].to|@escape}">
|
||||
</div>
|
||||
{elseif $so_val.type == 'authors'}
|
||||
{if $media.filter[$so_key] != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
|
||||
<select id="serendipity_filter_{$so_key}" name="serendipity[filter][{$so_key}]">
|
||||
<option value="">{$CONST.ALL_AUTHORS}</option>
|
||||
{foreach from=$media.authors item="media_author"}
|
||||
<option value="{$media_author.authorid}"{if $media.filter[$so_key] == $media_author.authorid} selected{/if}>{$media_author.realname|@escape}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
{else}
|
||||
{if $media.filter[$so_key] != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
|
||||
{* TODO: needs a label … but what IS this? *}
|
||||
<input id="serendipity_filter_{$so_key}" name="serendipity[filter][{$so_key}]" type="text" value="{$media.filter[$so_key]|@escape}">
|
||||
{/if}
|
||||
{if $so_val.type == 'date' || $so_val.type == 'intrange'}
|
||||
</fieldset>
|
||||
{else}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/foreach}
|
||||
<div id="media_filter_path" class="form_select">
|
||||
<label for="serendipity_only_path">{$CONST.FILTER_DIRECTORY}</label>
|
||||
<select id="serendipity_only_path" name="serendipity[only_path]">
|
||||
@ -55,59 +100,6 @@
|
||||
{* {if $media.keywords_selected != ''}<script>showFilters();</script>{/if} *}
|
||||
<fieldset id="media_pane_sort" class="additional_info">
|
||||
<legend class="visuallyhidden">{$CONST.SORT_ORDER}</legend>
|
||||
|
||||
{foreach from=$media.sort_order item="so_val" key="so_key"}
|
||||
<div class="{cycle values="left,center,right"}">
|
||||
{if $so_val.type == 'date' || $so_val.type == 'intrange'}
|
||||
<fieldset>
|
||||
<legend><span>{$CONST.SORT_BY} ({$so_key})</span></legend>
|
||||
{else}
|
||||
<div class="form_{if $so_val.type == 'authors'}select{else}field{/if}">
|
||||
<label for="serendipity_filter_{$so_key}">{$so_val.desc}</label>
|
||||
{/if}
|
||||
{if $so_val.type == 'date'}
|
||||
{if $media.filter[$so_key].from != '' OR $media.filter[$so_key].to != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
|
||||
<div class="form_field">
|
||||
{* Core might need to be adapted to input[type=date] *}
|
||||
{* date is not ideal, should be datetime – but datetime isn't properly supported *}
|
||||
{* by browsers yet, so we probably need a JS widget (jQuery UI?) for this … *}
|
||||
<label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">From</label> {* i18n *}
|
||||
<input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="date" value="{$media.filter[$so_key].from|@escape}">
|
||||
-
|
||||
<label for="serendipity_filter_{$so_key}_to" class="visuallyhidden">To</label> {* i18n *}
|
||||
<input id="serendipity_filter_{$so_key}_to" name="serendipity[filter][{$so_key}][to]" type="date" value="{$media.filter[$so_key].to|@escape}">
|
||||
{* <span class="input_hint">(DD.MM.YYYY | YYYY-MM-DD | MM/DD/YYYY)</span> *}
|
||||
</div>
|
||||
{elseif $so_val.type == 'intrange'}
|
||||
{if $media.filter[$so_key].from != '' OR $media.filter[$so_key].to != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
|
||||
<div class="form_field">
|
||||
{* Could also use input[type=range]; unsure if that's actually useful (yet) *}
|
||||
<label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">From</label> {* i18n *}
|
||||
<input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="text" value="{$media.filter[$so_key].from|@escape}">
|
||||
-
|
||||
<label for="serendipity_filter_{$so_key}_to" class="visuallyhidden">To</label> {* i18n *}
|
||||
<input id="serendipity_filter_{$so_key}_to" name="serendipity[filter][{$so_key}][to]" type="text" value="{$media.filter[$so_key].to|@escape}">
|
||||
</div>
|
||||
{elseif $so_val.type == 'authors'}
|
||||
{if $media.filter[$so_key] != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
|
||||
<select id="serendipity_filter_{$so_key}" name="serendipity[filter][{$so_key}]">
|
||||
<option value="">{$CONST.ALL_AUTHORS}</option>
|
||||
{foreach from=$media.authors item="media_author"}
|
||||
<option value="{$media_author.authorid}"{if $media.filter[$so_key] == $media_author.authorid} selected{/if}>{$media_author.realname|@escape}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
{else}
|
||||
{if $media.filter[$so_key] != ''}{assign var="show_filter" value=$media.filter[$so_key]}{/if}
|
||||
{* TODO: needs a label … but what IS this? *}
|
||||
<input id="serendipity_filter_{$so_key}" name="serendipity[filter][{$so_key}]" type="text" value="{$media.filter[$so_key]|@escape}">
|
||||
{/if}
|
||||
{if $so_val.type == 'date' || $so_val.type == 'intrange'}
|
||||
</fieldset>
|
||||
{else}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{/foreach}
|
||||
<div class="clearfix">
|
||||
<div class="form_select">
|
||||
<label for="serendipity_sortorder_order">{$CONST.SORT_BY}</label>
|
||||
@ -143,6 +135,14 @@
|
||||
<input name="go" type="submit" value="{$CONST.GO}">
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset id="media_selector_bar">
|
||||
<input type="radio" id="serendipity[filter][fileCategory][All]" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == ""}checked{/if} value=""></input>
|
||||
<label for="serendipity[filter][fileCategory][All]" class="media_selector">All</label>
|
||||
<input id="serendipity[filter][fileCategory][Image]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "image"}checked{/if} value="image"></input>
|
||||
<label for="serendipity[filter][fileCategory][Image]" class="media_selector">{$CONST.IMAGE}</label>
|
||||
<input id="serendipity[filter][fileCategory][Video]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "video"}checked{/if} value="video"></input>
|
||||
<label for="serendipity[filter][fileCategory][Video]" class="media_selector">{$CONST.VIDEO}</label>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
{if $media.nr_files < 1}
|
||||
|
||||
@ -691,7 +691,7 @@ function highlightComment(id, checkvalue) {
|
||||
}
|
||||
|
||||
$('#insert_image').click(function(e) {
|
||||
window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=category_icon&serendipity[filename_only]=true',
|
||||
window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=category_icon&serendipity[filename_only]=true',
|
||||
'ImageSel',
|
||||
'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
|
||||
});
|
||||
@ -752,4 +752,10 @@ function highlightComment(id, checkvalue) {
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// MediaDB-Filter-Buttons should react instantly
|
||||
$('input[name="serendipity[filter][fileCategory]"]').on('change', function() {
|
||||
$('#media_library_control').submit();
|
||||
});
|
||||
|
||||
})(jQuery);
|
||||
|
||||
@ -1655,6 +1655,9 @@ input[name="serendipity[filter][fileCategory]"] {
|
||||
|
||||
.media_selector {
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
padding: 0.6em;
|
||||
border: 1px solid #aaa;
|
||||
}
|
||||
|
||||
input:checked + .media_selector {
|
||||
@ -1669,6 +1672,13 @@ input:checked + .media_selector {
|
||||
border-color: #999 #bbb #ddd;
|
||||
}
|
||||
|
||||
#media_selector_bar {
|
||||
background: #eee;
|
||||
padding: 0.3em;
|
||||
margin: 0.5em 2% 0.2em 0;
|
||||
border: 1px solid #aaa;
|
||||
}
|
||||
|
||||
|
||||
/* SMALL SCREEN (e.g. smartphones)
|
||||
----------------------------------------------------------------- */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user