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

modernize media_pane Smarty loops

Browse Source 
and add two additional div content blocks with class="popuplayer_showUpload" and class="media_library_pane"
fix some more indent
and set some code documentary to keep things clear

We will need to check this again, since some ordermode items (mostly the bp.* ones), like bp.TITLE|COMMENTx|DATE break the flow or are not set right and need some conditional tweaks.
This commit is contained in:
Ian 2015-09-23 16:32:12 +02:00
parent 3fca094dfa
commit 7ceb1a711e
1 changed files with 78 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,9 +12,9 @@
<label for="serendipity_only_path" class="visuallyhidden">{$CONST.FILTER_DIRECTORY}</label> <label for="serendipity_only_path" class="visuallyhidden">{$CONST.FILTER_DIRECTORY}</label>
<select id="serendipity_only_path" name="serendipity[only_path]"> <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> <option value="">{if NOT $media.limit_path}{$CONST.ALL_DIRECTORIES}{else}{$media.blimit_path}{/if}</option>
{foreach from=$media.paths item="folder"} {foreach $media.paths AS $folderHead}
<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> <option{if ($media.only_path == $media.limit_path|cat:$folderHead.relpath)} selected{/if} value="{$folderHead.relpath}">{'&nbsp;'|str_repeat:($folderHead.depth*2)}{$folderHead.name}</option>
{/foreach} {/foreach}
</select> </select>
@ -35,53 +35,53 @@
<fieldset id="media_pane_filter" class="additional_info filter_pane"> <fieldset id="media_pane_filter" class="additional_info filter_pane">
<legend class="visuallyhidden">{$CONST.FILTERS}</legend> <legend class="visuallyhidden">{$CONST.FILTERS}</legend>
{* Keep in mind that $media.sort_order is different than $media.sortorder! The first is for building the key names; the second is the value that was set by POST! *}
<div id="media_filter" class="clearfix"> <div id="media_filter" class="clearfix">
{foreach from=$media.sort_order item="so_val" key="so_key"} {foreach $media.sort_order AS $filter}
<div class="{cycle values="left,center,right"}"> <div class="{cycle values="left,center,right"}">
{if $so_val.type == 'date' || $so_val.type == 'intrange'} {if $filter.type == 'date' || $filter.type == 'intrange'}
<fieldset> <fieldset>
<span class="wrap_legend"><legend>{$CONST.SORT_BY} ({$so_key})</legend></span> <span class="wrap_legend"><legend>{$CONST.SORT_BY} ({$filter@key})</legend></span>
{else} {else}
<div class="form_{if $so_val.type == 'authors'}select{else}field{/if}"> <div class="form_{if $filter.type == 'authors'}select{else}field{/if}">
<label for="serendipity_filter_{$so_key}">{$so_val.desc}</label> <label for="serendipity_filter_{$filter@key}">{$filter.desc}</label>
{/if} {/if}
{if $so_val.type == 'date'} {if $filter.type == 'date'}
<div class="form_field"> <div class="form_field">
<label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">{$CONST.RANGE_FROM}</label> <label for="serendipity_filter_{$filter@key}_from" class="visuallyhidden">{$CONST.RANGE_FROM}</label>
<input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="date" value="{$media.filter[$so_key].from|escape}"> <input id="serendipity_filter_{$filter@key}_from" name="serendipity[filter][{$filter@key}][from]" type="date" value="{$media.filter[$filter@key].from|escape}">
- -
<label for="serendipity_filter_{$so_key}_to" class="visuallyhidden">{$CONST.RANGE_TO}</label> <label for="serendipity_filter_{$filter@key}_to" class="visuallyhidden">{$CONST.RANGE_TO}</label>
<input id="serendipity_filter_{$so_key}_to" name="serendipity[filter][{$so_key}][to]" type="date" value="{$media.filter[$so_key].to|escape}"> <input id="serendipity_filter_{$filter@key}_to" name="serendipity[filter][{$filter@key}][to]" type="date" value="{$media.filter[$filter@key].to|escape}">
</div> </div>
{elseif $so_val.type == 'intrange'} {elseif $filter.type == 'intrange'}
<div class="form_field"> <div class="form_field">
<label for="serendipity_filter_{$so_key}_from" class="visuallyhidden">{$CONST.RANGE_FROM}</label> <label for="serendipity_filter_{$filter@key}_from" class="visuallyhidden">{$CONST.RANGE_FROM}</label>
<input id="serendipity_filter_{$so_key}_from" name="serendipity[filter][{$so_key}][from]" type="text" value="{$media.filter[$so_key].from|escape}"> <input id="serendipity_filter_{$filter@key}_from" name="serendipity[filter][{$filter@key}][from]" type="text" value="{$media.filter[$filter@key].from|escape}">
- -
<label for="serendipity_filter_{$so_key}_to" class="visuallyhidden">{$CONST.RANGE_TO}</label> <label for="serendipity_filter_{$filter@key}_to" class="visuallyhidden">{$CONST.RANGE_TO}</label>
<input id="serendipity_filter_{$so_key}_to" name="serendipity[filter][{$so_key}][to]" type="text" value="{$media.filter[$so_key].to|escape}"> <input id="serendipity_filter_{$filter@key}_to" name="serendipity[filter][{$filter@key}][to]" type="text" value="{$media.filter[$filter@key].to|escape}">
</div> </div>
{elseif $so_val.type == 'authors'} {elseif $filter.type == 'authors'}
<select id="serendipity_filter_{$so_key}" name="serendipity[filter][{$so_key}]"> <select id="serendipity_filter_{$filter@key}" name="serendipity[filter][{$filter@key}]">
<option value="">{$CONST.ALL_AUTHORS}</option> <option value="">{$CONST.ALL_AUTHORS}</option>
{foreach from=$media.authors item="media_author"} {foreach $media.authors AS $media_author}
<option value="{$media_author.authorid}"{if $media.filter[$so_key] == $media_author.authorid} selected{/if}>{$media_author.realname|escape}</option> <option value="{$media_author.authorid}"{if $media.filter[$filter@key] == $media_author.authorid} selected{/if}>{$media_author.realname|escape}</option>
{/foreach} {/foreach}
</select> </select>
{else} {else}{* this is type string w/o being named *}
{* TODO: needs a label, but what IS this? *} {* label is already set on loop start, when type is not date or intrange *}
<input id="serendipity_filter_{$so_key}" name="serendipity[filter][{$so_key}]" type="text" value="{$media.filter[$so_key]|escape}"> <input id="serendipity_filter_{$filter@key}" name="serendipity[filter][{$filter@key}]" type="text" value="{$media.filter[$filter@key]|escape}">
{/if} {/if}
{if $so_val.type == 'date' || $so_val.type == 'intrange'} {if $filter.type == 'date' || $filter.type == 'intrange'}
</fieldset> </fieldset>
{else} {else}
@ -89,7 +89,7 @@
</div> </div>
{/if} {/if}
</div> </div>{* media filter end *}
{/foreach} {/foreach}
<div id="media_filter_file" class="form_field left"> <div id="media_filter_file" class="form_field left">
@ -103,7 +103,7 @@
</div> </div>
<div id="keyword_list" class="clearfix right"> <div id="keyword_list" class="clearfix right">
{foreach from=$media.keywords item="keyword"} {foreach $media.keywords AS $keyword}
<a class="add_keyword" href="#keyword-input" data-keyword="{$keyword|escape}" title="{$keyword|escape}">{$keyword|escape|truncate:20:"&hellip;"}</a> <a class="add_keyword" href="#keyword-input" data-keyword="{$keyword|escape}" title="{$keyword|escape}">{$keyword|escape|truncate:20:"&hellip;"}</a>
{/foreach} {/foreach}
@ -117,11 +117,11 @@
<div class="clearfix grouped"> <div class="clearfix grouped">
<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>
{* Keep in mind that $media.sort_order is different than $media.sortorder! *}
<select id="serendipity_sortorder_order" name="serendipity[sortorder][order]"> <select id="serendipity_sortorder_order" name="serendipity[sortorder][order]">
{foreach from=$media.sort_order item="so_val" key="so_key"} {foreach $media.sort_order AS $orderVal}
{* The first is for building the key names *}
<option value="{$so_key}"{if $media.sortorder.order == $so_key} selected{/if}>{$so_val.desc}</option> <option value="{$orderVal@key}"{if $media.sortorder.order == $orderVal@key} selected{/if}>{$orderVal.desc}</option>
{/foreach} {/foreach}
</select> </select>
@ -129,7 +129,7 @@
<div class="form_select"> <div class="form_select">
<label for="serendipity_sortorder_ordermode">{$CONST.SORT_ORDER}</label> <label for="serendipity_sortorder_ordermode">{$CONST.SORT_ORDER}</label>
{* The second is the value that was set by POST or COOKIE! *}
<select id="serendipity_sortorder_ordermode" name="serendipity[sortorder][ordermode]"> <select id="serendipity_sortorder_ordermode" name="serendipity[sortorder][ordermode]">
<option value="DESC"{if $media.sortorder.ordermode == 'DESC'} selected{/if}>{$CONST.SORT_ORDER_DESC}</option> <option value="DESC"{if $media.sortorder.ordermode == 'DESC'} selected{/if}>{$CONST.SORT_ORDER_DESC}</option>
<option value="ASC"{if $media.sortorder.ordermode == 'ASC'} selected{/if}>{$CONST.SORT_ORDER_ASC}</option> <option value="ASC"{if $media.sortorder.ordermode == 'ASC'} selected{/if}>{$CONST.SORT_ORDER_ASC}</option>
@ -140,9 +140,9 @@
<label for="serendipity_sortorder_perpage">{$CONST.FILES_PER_PAGE}</label> <label for="serendipity_sortorder_perpage">{$CONST.FILES_PER_PAGE}</label>
<select id="serendipity_sortorder_perpage" name="serendipity[sortorder][perpage]"> <select id="serendipity_sortorder_perpage" name="serendipity[sortorder][perpage]">
{foreach from=$media.sort_row_interval item="so_val"} {foreach $media.sort_row_interval AS $perPageVal}
<option value="{$so_val}"{if $media.perPage == $so_val} selected{/if}>{$so_val}</option> <option value="{$perPageVal}"{if $media.perPage == $perPageVal} selected{/if}>{$perPageVal}</option>
{/foreach} {/foreach}
</select> </select>
@ -167,13 +167,15 @@
}); });
</script> </script>
</form> </form>
</div> </div>{* has toolbar end *}
{if $smarty.get.serendipity.showUpload} {if $smarty.get.serendipity.showUpload}
<div class="popuplayer_showUpload">
<a class="button_link" href="?serendipity[adminModule]=media&serendipity[adminAction]=addSelect&{$media.extraParems}">{$CONST.ADD_MEDIA}</a> <a class="button_link" href="?serendipity[adminModule]=media&serendipity[adminAction]=addSelect&{$media.extraParems}">{$CONST.ADD_MEDIA}</a>
</div>
{/if} {/if}
<div class="media_library_pane">
{if $media.nr_files < 1} {if $media.nr_files < 1}
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.NO_IMAGES_FOUND}</span> <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.NO_IMAGES_FOUND}</span>
@ -189,6 +191,7 @@
<div class="clearfix media_pane" data-thumbmaxwidth="{$media.thumbSize}"> <div class="clearfix media_pane" data-thumbmaxwidth="{$media.thumbSize}">
{$MEDIA_ITEMS} {$MEDIA_ITEMS}
{if ($media.page != 1 && $media.page <= $media.pages)||$media.page != $media.pages} {if ($media.page != 1 && $media.page <= $media.pages)||$media.page != $media.pages}
<nav class="pagination"> <nav class="pagination">
@ -201,7 +204,8 @@
</nav> </nav>
{/if} {/if}
</div> </div>{* media pane end *}
{if $media.manage} {if $media.manage}
<div class="form_buttons"> <div class="form_buttons">
@ -212,9 +216,9 @@
<input type="hidden" name="serendipity[oldDir]" value=""> <input type="hidden" name="serendipity[oldDir]" value="">
<select id="newDir" name="serendipity[newDir]"> <select id="newDir" name="serendipity[newDir]">
<option value=""></option> <option value=""></option>
{foreach from=$media.paths item="folder"} {foreach $media.paths AS $folderFoot}
<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> <option{if ($media.only_path == $media.limit_path|cat:$folderFoot.relpath)} selected{/if} value="{$folderFoot.relpath}">{'&nbsp;'|str_repeat:($folderFoot.depth*2)}{$folderFoot.name}</option>
{/foreach} {/foreach}
</select> </select>
@ -224,3 +228,5 @@
</form> </form>
{/if} {/if}
{/if} {/if}
</div>{* media library pane end *}