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

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Matthias Mees
2013-06-04 17:51:48 +02:00
parent e404792c29 566359a20f
commit 8d72e632cc
3 changed files with 78 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
<div class="has_toolbar"> <div class="has_toolbar">
<h2>{$CONST.FIND_MEDIA}</h2> <h2>{$CONST.FIND_MEDIA}</h2>
<form method="get" action="?"> <form id="media_library_control" method="get" action="?">
{$media.token} {$media.token}
{$media.form_hidden} {$media.form_hidden}
<ul class="filters_toolbar plainList"> <ul class="filters_toolbar plainList">
@@ -12,50 +12,12 @@
{if $media.show_upload} {if $media.show_upload}
<li><input type="button" value="{$CONST.ADD_MEDIA|@escape}" onclick="location.href='{$media.url}&amp;serendipity[adminAction]=addSelect&amp;serendipity[only_path]={$media.only_path|escape:url}'; return false"></li> <li><input type="button" value="{$CONST.ADD_MEDIA|@escape}" onclick="location.href='{$media.url}&amp;serendipity[adminAction]=addSelect&amp;serendipity[only_path]={$media.only_path|escape:url}'; return false"></li>
{/if} {/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> </ul>
<fieldset id="media_pane_filter" class="additional_info"> <fieldset id="media_pane_filter" class="additional_info">
<legend class="visuallyhidden">{$CONST.FILTERS}</legend> <legend class="visuallyhidden">{$CONST.FILTERS}</legend>
<div id="media_filter" class="clearfix"> <div id="media_filter" class="clearfix">
<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]">
<option value="">{if NOT $media.limit_path}{$CONST.ALL_DIRECTORIES}{else}{$media.blimit_path}{/if}</option>
{foreach from=$media.paths item="folder"}
<option{if ($media.only_path == $media.limit_path|cat:$folder.relpath)} selected{/if} value="{$folder.relpath}">{'&nbsp;'|str_repeat:($folder.depth*2)}{$folder.name}</option>
{/foreach}
</select>
</div>
<div id="media_filter_file" class="form_field">
<label for="serendipity_only_filename">{$CONST.SORT_ORDER_NAME}</label>
<input id="serendipity_only_filename" name="serendipity[only_filename]" type="text" value="{$media.only_filename|@escape}">
</div>
<div class="form_field">
<label for="keyword_input">{$CONST.MEDIA_KEYWORDS}</label>
<input id="keyword_input" name="serendipity[keywords]" type="text" value="{$media.keywords_selected|@escape}">
<div id="keyword_list" class="clearfix">
{foreach from=$media.keywords item="keyword"}
<a href="#" onclick="AddKeyword('{$keyword|@escape}'); return false">{$keyword|@escape}</a>
{/foreach}
</div>
</div>
</div>
</fieldset>
{* {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"} {foreach from=$media.sort_order item="so_val" key="so_key"}
<div class="{cycle values="left,center,right"}"> <div class="{cycle values="left,center,right"}">
{if $so_val.type == 'date' || $so_val.type == 'intrange'} {if $so_val.type == 'date' || $so_val.type == 'intrange'}
@@ -108,6 +70,36 @@
{/if} {/if}
</div> </div>
{/foreach} {/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]">
<option value="">{if NOT $media.limit_path}{$CONST.ALL_DIRECTORIES}{else}{$media.blimit_path}{/if}</option>
{foreach from=$media.paths item="folder"}
<option{if ($media.only_path == $media.limit_path|cat:$folder.relpath)} selected{/if} value="{$folder.relpath}">{'&nbsp;'|str_repeat:($folder.depth*2)}{$folder.name}</option>
{/foreach}
</select>
</div>
<div id="media_filter_file" class="form_field">
<label for="serendipity_only_filename">{$CONST.SORT_ORDER_NAME}</label>
<input id="serendipity_only_filename" name="serendipity[only_filename]" type="text" value="{$media.only_filename|@escape}">
</div>
<div class="form_field">
<label for="keyword_input">{$CONST.MEDIA_KEYWORDS}</label>
<input id="keyword_input" name="serendipity[keywords]" type="text" value="{$media.keywords_selected|@escape}">
<div id="keyword_list" class="clearfix">
{foreach from=$media.keywords item="keyword"}
<a href="#" onclick="AddKeyword('{$keyword|@escape}'); return false">{$keyword|@escape}</a>
{/foreach}
</div>
</div>
</div>
</fieldset>
{* {if $media.keywords_selected != ''}<script>showFilters();</script>{/if} *}
<fieldset id="media_pane_sort" class="additional_info">
<legend class="visuallyhidden">{$CONST.SORT_ORDER}</legend>
<div class="clearfix"> <div class="clearfix">
<div class="form_select"> <div class="form_select">
<label for="serendipity_sortorder_order">{$CONST.SORT_BY}</label> <label for="serendipity_sortorder_order">{$CONST.SORT_BY}</label>
@@ -143,6 +135,14 @@
<input name="go" type="submit" value="{$CONST.GO}"> <input name="go" type="submit" value="{$CONST.GO}">
</div> </div>
</fieldset> </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> </form>
</div> </div>
{if $media.nr_files < 1} {if $media.nr_files < 1}

8
templates/2k11/admin/serendipity_editor.js.tpl
View File

@@ -691,7 +691,7 @@ function highlightComment(id, checkvalue) {
} }
$('#insert_image').click(function(e) { $('#insert_image').click(function(e) {
window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=category_icon&amp;serendipity[filename_only]=true', window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=category_icon&serendipity[filename_only]=true',
'ImageSel', 'ImageSel',
'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1'); '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); })(jQuery);

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

@@ -1655,6 +1655,9 @@ input[name="serendipity[filter][fileCategory]"] {
.media_selector { .media_selector {
cursor: pointer; cursor: pointer;
display: inline-block;
padding: 0.6em;
border: 1px solid #aaa;
} }
input:checked + .media_selector { input:checked + .media_selector {
@@ -1669,6 +1672,13 @@ input:checked + .media_selector {
border-color: #999 #bbb #ddd; 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) /* SMALL SCREEN (e.g. smartphones)
----------------------------------------------------------------- */ ----------------------------------------------------------------- */