diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl
index ccdb77f4..967d3936 100644
--- a/templates/2k11/admin/media_items.tpl
+++ b/templates/2k11/admin/media_items.tpl
@@ -55,163 +55,207 @@
{$img_alt="{$file.mime}"}
{/if}
{/if}
- {* builds a ML objects link for step 1, to pass to media_choose.tpl file passthrough media.filename_only scripts - do not use "empty($link) AND" here, since that would require a reset before! *}
+ {* builds a ML objects link for step 1, to pass to media_choose.tpl file section: passthrough media.filename_only scripts - do not use "empty($link) AND" here, since that would require a reset before! *}
{if (!$file.is_image OR $file.is_image == 0) AND $file.mediatype != 'image' AND $file.realfile}
{$link="?serendipity[adminModule]=images&serendipity[adminAction]=choose&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[fid]={$file.id}&serendipity[filename_only]={$media.filename_only}&serendipity[textarea]={$media.textarea}&serendipity[htmltarget]={$media.htmltarget}"}
{/if}
- <article id="media_{$file.id}" class="media_file {cycle values="odd,even"}">
- <header class="clearfix">
- <div class="form_check">
- <input id="multidelete_image{$file.id}" class="multidelete" name="serendipity[multiDelete][]" type="checkbox" value="{$file.id}" data-multidelid="media_{$file.id}"><label for="multidelete_image{$file.id}" class="visuallyhidden">{$CONST.TOGGLE_SELECT}</label>
- </div>
- <h3 title="{$file.realname}">{$file.realname|truncate:30:"…"}{if $file.orderkey != ''}: {$file.orderkey|escape}{/if}</h3>
- {if $file.authorid != 0}<span class="author block_level">{$file.authorname}</span>{/if}
- </header>
+ <article id="media_{$file.id}" class="media_file {cycle values="odd,even"}">
+ <header class="clearfix">
+ <div class="form_check">
+ <input id="multidelete_image{$file.id}" class="multidelete" name="serendipity[multiDelete][]" type="checkbox" value="{$file.id}" data-multidelid="media_{$file.id}">
+ <label for="multidelete_image{$file.id}" class="visuallyhidden">{$CONST.TOGGLE_SELECT}</label>
+ </div>
- <div class="clearfix equal_heights media_file_wrap">
- <div class="media_file_preview">
- <a {if $media.manage}class="media_fullsize"{/if} href="{$link}" title="{$CONST.MEDIA_FULLSIZE}: {$file.realname}" data-pwidth="{$file.popupWidth}" data-pheight="{$file.popupHeight}">
- <img src="{$img_src}" title="{$img_title}" alt="{$img_alt}">
- </a>
- <footer id="media_file_meta_{$file.id}" class="media_file_meta additional_info">
- <ul class="plainList">
+ <h3 title="{$file.realname}">{$file.realname|truncate:30:"…"}{if $file.orderkey != ''}: {$file.orderkey|escape}{/if}</h3>
+ {if $file.authorid != 0}<span class="author block_level">{$file.authorname}</span>{/if}
+
+ </header>
+
+ <div class="clearfix equal_heights media_file_wrap">
+ <div class="media_file_preview">
+ <a {if $media.manage}class="media_fullsize"{/if} href="{$link}" title="{$CONST.MEDIA_FULLSIZE}: {$file.realname}" data-pwidth="{$file.popupWidth}" data-pheight="{$file.popupHeight}">
+ <img src="{$img_src}" title="{$img_title}" alt="{$img_alt}">
+ </a>
+ <footer id="media_file_meta_{$file.id}" class="media_file_meta additional_info">
+ <ul class="plainList">
+ {if $file.hotlink}
+
+ <li>{$file.nice_hotlink}</li>
+ <li>{$CONST.MEDIA_HOTLINKED}</li>
+ {else}
+ {if $file.realname != $file.diskname}
+
+ <li title="{$file.diskname}">{$file.diskname|truncate:30:"…"}</li>
+ {/if}
+ {if $file.mime}
+
+ <li><b>MIME-Type:</b> {$file.mime}</li>
+ {/if}
+ {if $file.is_image}
+
+ <li><b>{$CONST.ORIGINAL_SHORT}:</b> {$file.dimensions_width}x{$file.dimensions_height}</li>
+ <li><b>{$CONST.THUMBNAIL_SHORT}:</b> {$file.dim.0}x{$file.dim.1}</li>
+ {/if}
+
+ <li><b>{$CONST.IMAGE_SIZE}:</b> {$file.nice_size} KB</li>
+ <li><b>{$CONST.INSTALL_RELUPLOADPATH}:</b> "{$file.path}"</li>
+ {/if}
+
+ </ul>
+ </footer>
+ </div>
+ </div>
+ {if $media.manage || {serendipity_getConfigVar key='showMediaToolbar'}}
+
+ <ul class="media_file_actions actions plainList clearfix">
+ <li><a class="media_show_info button_link" href="#media_file_meta_{$file.id}" title="{$CONST.SHOW_METADATA}"><span class="icon-info-circled"></span><span class="visuallyhidden"> {$CONST.SHOW_METADATA}</span></a></li>
+ {if $file.is_editable}
+
+ <li><button class="media_rename button_link" type="button" title="{$CONST.MEDIA_RENAME}" data-fileid="{$file.id}" data-filename="{$file.name|escape:javascript}"><span class="icon-edit"></span><span class="visuallyhidden"> {$CONST.MEDIA_RENAME}</span></button></li>
+ {if $file.is_image AND NOT $file.hotlink}
+
+ <li><a class="media_resize button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fname]={$file.name|truncate:30:"…"}&serendipity[fid]={$file.id}{$media.extraParems}" title="{$CONST.IMAGE_RESIZE}"><span class="icon-resize-full"></span><span class="visuallyhidden"> {$CONST.IMAGE_RESIZE}</span></a></li>
+ {/if}
+ {if $file.is_image AND NOT $file.hotlink}
+
+ <li><a class="media_rotate_left button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateCCW&serendipity[fid]={$file.id}" title="{$CONST.IMAGE_ROTATE_LEFT}"><span class="icon-ccw"></span><span class="visuallyhidden"> {$CONST.IMAGE_ROTATE_LEFT}</span></a></li>
+ {/if}
+ {if $file.is_image AND NOT $file.hotlink}
+
+ <li><a class="media_rotate_right button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateCW&serendipity[fid]={$file.id}" title="{$CONST.IMAGE_ROTATE_RIGHT}"><span class="icon-cw"></span><span class="visuallyhidden">{$CONST.IMAGE_ROTATE_RIGHT}</span></a></li>
+ {/if}
+ {if $media.manage}
+
+ <li><a class="media_prop button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=properties&serendipity[fid]={$file.id}" title="{$CONST.MEDIA_PROP}"><span class="icon-picture"></span><span class="visuallyhidden"> {$CONST.MEDIA_PROP}</span></a></li>
+ {/if}
+
+ <li><a class="media_delete button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]={$file.id}" title="{$CONST.MEDIA_DELETE}" data-fileid="{$file.id}" data-filename="{$file.name|escape:javascript}"><span class="icon-trash"></span><span class="visuallyhidden"> {$CONST.MEDIA_DELETE}</span></a></li>
+ {/if}
+
+ </ul>
+ {/if}
+
+ </article>
+
+ {if NOT $media.enclose}
+
+ <article class="media_file media_enclose_no">
+ <header>
+ <h3>{$file.realname}</h3>
+ <span class="block_level"><b>{$CONST.SORT_ORDER_EXTENSION}:</b> {$file.mime}{if $file.realname != $file.diskname}, {$file.diskname}{/if}</span>
+ </header>
+
+ <footer>
+ <ul class="media_file_meta plainList">
+ <li><b>{$CONST.SORT_ORDER_DATE}:</b> {if $file.authorid != 0}{$CONST.POSTED_BY} {$file.authorname} {/if}{$CONST.ON} {$file.date|formatTime:DATE_FORMAT_SHORT}</li>
{if $file.hotlink}
+
<li>{$file.nice_hotlink}</li>
- <li>{$CONST.MEDIA_HOTLINKED}</li>
- {else}
- {if $file.realname != $file.diskname}
- <li title="{$file.diskname}">{$file.diskname|truncate:30:"…"}</li>
- {/if}
- {if $file.mime}
- <li><b>MIME-Type:</b> {$file.mime}</li>
- {/if}
- {if $file.is_image}
+ {elseif $file.is_image}
+
<li><b>{$CONST.ORIGINAL_SHORT}:</b> {$file.dimensions_width}x{$file.dimensions_height}</li>
<li><b>{$CONST.THUMBNAIL_SHORT}:</b> {$file.dim.0}x{$file.dim.1}</li>
- {/if}
- <li><b>{$CONST.IMAGE_SIZE}:</b> {$file.nice_size} KB</li>
- <li><b>{$CONST.INSTALL_RELUPLOADPATH}:</b> "{$file.path}"</li>
{/if}
+
+ <li><b>{$CONST.IMAGE_SIZE}:</b> {$file.nice_size} KB</li>
</ul>
</footer>
- </div>
- </div>
- {if $media.manage || {serendipity_getConfigVar key='showMediaToolbar'}}
- <ul class="media_file_actions actions plainList clearfix">
- <li><a class="media_show_info button_link" href="#media_file_meta_{$file.id}" title="{$CONST.SHOW_METADATA}"><span class="icon-info-circled"></span><span class="visuallyhidden"> {$CONST.SHOW_METADATA}</span></a></li>
- {if $file.is_editable}
- <li><button class="media_rename button_link" type="button" title="{$CONST.MEDIA_RENAME}" data-fileid="{$file.id}" data-filename="{$file.name|escape:javascript}"><span class="icon-edit"></span><span class="visuallyhidden"> {$CONST.MEDIA_RENAME}</span></button></li>
- {if $file.is_image AND NOT $file.hotlink}
- <li><a class="media_resize button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fname]={$file.name|truncate:30:"…"}&serendipity[fid]={$file.id}{$media.extraParems}" title="{$CONST.IMAGE_RESIZE}"><span class="icon-resize-full"></span><span class="visuallyhidden"> {$CONST.IMAGE_RESIZE}</span></a></li>
- {/if}
- {if $file.is_image AND NOT $file.hotlink}
- <li><a class="media_rotate_left button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateCCW&serendipity[fid]={$file.id}" title="{$CONST.IMAGE_ROTATE_LEFT}"><span class="icon-ccw"></span><span class="visuallyhidden"> {$CONST.IMAGE_ROTATE_LEFT}</span></a></li>
- {/if}
- {if $file.is_image AND NOT $file.hotlink}
- <li><a class="media_rotate_right button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=rotateCW&serendipity[fid]={$file.id}" title="{$CONST.IMAGE_ROTATE_RIGHT}"><span class="icon-cw"></span><span class="visuallyhidden">{$CONST.IMAGE_ROTATE_RIGHT}</span></a></li>
- {/if}
- {if $media.manage}
- <li><a class="media_prop button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=properties&serendipity[fid]={$file.id}" title="{$CONST.MEDIA_PROP}"><span class="icon-picture"></span><span class="visuallyhidden"> {$CONST.MEDIA_PROP}</span></a></li>
- {/if}
- <li><a class="media_delete button_link" href="?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]={$file.id}" title="{$CONST.MEDIA_DELETE}" data-fileid="{$file.id}" data-filename="{$file.name|escape:javascript}"><span class="icon-trash"></span><span class="visuallyhidden"> {$CONST.MEDIA_DELETE}</span></a></li>
- {/if}
- </ul>
- {/if}
- </article>
- {if NOT $media.enclose}
- <article class="media_file media_enclose_no">
- <header>
- <h3>{$file.realname}</h3>
- <span class="block_level"><b>{$CONST.SORT_ORDER_EXTENSION}:</b> {$file.mime}{if $file.realname != $file.diskname}, {$file.diskname}{/if}</span>
- </header>
+ <input type="hidden" name="serendipity[mediaProperties][{$mediakey}][image_id]" value="{$file.image_id}">
- <footer>
- <ul class="media_file_meta plainList">
- <li><b>{$CONST.SORT_ORDER_DATE}:</b> {if $file.authorid != 0}{$CONST.POSTED_BY} {$file.authorname} {/if}{$CONST.ON} {$file.date|formatTime:DATE_FORMAT_SHORT}</li>
- {if $file.hotlink}
- <li>{$file.nice_hotlink}</li>
- {elseif $file.is_image}
- <li><b>{$CONST.ORIGINAL_SHORT}:</b> {$file.dimensions_width}x{$file.dimensions_height}</li>
- <li><b>{$CONST.THUMBNAIL_SHORT}:</b> {$file.dim.0}x{$file.dim.1}</li>
- {/if}
- <li><b>{$CONST.IMAGE_SIZE}:</b> {$file.nice_size} KB</li>
- </ul>
- </footer>
-
- <input type="hidden" name="serendipity[mediaProperties][{$mediakey}][image_id]" value="{$file.image_id}">
+ <section class="media_file_props">
+ <h4>{$CONST.MEDIA_PROP}</h4>
+ {foreach from=$file.base_property key="prop_fieldname" item="prop_content"}
- <section class="media_file_props">
- <h4>{$CONST.MEDIA_PROP}</h4>
- {foreach from=$file.base_property key="prop_fieldname" item="prop_content"}
- <div class="form_{if $prop_content.type == 'textarea'}area{else}field{/if}">
- <label for="mediaProperty{$prop_fieldname}">{$prop_content.label}</label>
- {if $prop_content.type == 'textarea'}
- <textarea id="mediaProperty{$prop_fieldname}" name="serendipity[mediaProperties][{$mediakey}][{$prop_content.title}]" rows="5">{$prop_content.val|escape}</textarea>
- {elseif $prop_content.type == 'readonly'}
- {$prop_content.val|escape}
- {elseif $prop_content.type == 'input'}
- <input id="mediaProperty{$prop_fieldname}" name="serendipity[mediaProperties][{$mediakey}][{$prop_content.title}]" type="text" value="{$prop_content.val|escape}">
- {/if}
- </div>
- {/foreach}
- {if NOT $file.hotlink}
- <div class="form_select">
- <label for="newDir{$mediakey}">{$CONST.FILTER_DIRECTORY}</label>
- <input type="hidden" name="serendipity[oldDir][{$mediakey}]" value="{$file.path|escape}">
- <select id="newDir{$mediakey}" name="serendipity[newDir][{$mediakey}]">
- <option value=""></option>
- {foreach from=$media.paths item="folder"}
- <option{if ($file.path == $folder.relpath)} selected{/if} value="{$folder.relpath}">{' '|str_repeat:($folder.depth*2)}{$folder.name}</option>
- {/foreach}
- </select>
- </div>
- {/if}
- </section>
+ <div class="form_{if $prop_content.type == 'textarea'}area{else}field{/if}">
+ <label for="mediaProperty{$prop_fieldname}">{$prop_content.label}</label>
+ {if $prop_content.type == 'textarea'}
- <section class="media_file_keywords">
- <h4>{$CONST.MEDIA_KEYWORDS}</h4>
+ <textarea id="mediaProperty{$prop_fieldname}" name="serendipity[mediaProperties][{$mediakey}][{$prop_content.title}]" rows="5">{$prop_content.val|escape}</textarea>
+ {elseif $prop_content.type == 'readonly'}
+ {$prop_content.val|escape}
+ {elseif $prop_content.type == 'input'}
- <ul class="clearfix plainList">
- {foreach from=$file.base_keywords key="keyword_row" item="keyword_cells"}
- {foreach from=$keyword_cells key="keyword_cell" item="keyword"}
- {if $keyword.name}
- <li><input id="mediaKeyword{$keyword.name}{$mediakey}" name="serendipity[mediaKeywords][{$mediakey}][{$keyword.name}]" type="checkbox" value="true"{if $keyword.selected} checked="checked"{/if}>
- <label for="mediaKeyword{$keyword.name}{$mediakey}">{$keyword.name|truncate:20:"…"}</label></li>
+ <input id="mediaProperty{$prop_fieldname}" name="serendipity[mediaProperties][{$mediakey}][{$prop_content.title}]" type="text" value="{$prop_content.val|escape}">
{/if}
- {/foreach}
- {/foreach}
- </ul>
- </section>
- <section class="media_file_metadata clearfix">
- <h4>EXIF/IPTC/XMP</h4>
- {foreach from=$file.metadata key="meta_type" item="meta_data"}
- <h5>{$meta_type}</h5>
- {if is_array($meta_data)}
- <dl class="clearfix">
- {foreach from=$meta_data key="meta_name" item="meta_value"}
- <dt>{$meta_name}</dt>
- <dd>{if is_array($meta_value)}{$meta_value|print_r}{else}{$meta_value|formatTime:DATE_FORMAT_SHORT:false:$meta_name}{/if}</dd>
- {/foreach}
- </dl>
- {else}
- <p>{$meta_data|formatTime:DATE_FORMAT_SHORT:false:$meta_type}</p>
+ </div>
+ {/foreach}
+ {if NOT $file.hotlink}
+
+ <div class="form_select">
+ <label for="newDir{$mediakey}">{$CONST.FILTER_DIRECTORY}</label>
+ <input type="hidden" name="serendipity[oldDir][{$mediakey}]" value="{$file.path|escape}">
+ <select id="newDir{$mediakey}" name="serendipity[newDir][{$mediakey}]">
+ <option value=""></option>
+ {foreach from=$media.paths item="folder"}
+
+ <option{if ($file.path == $folder.relpath)} selected{/if} value="{$folder.relpath}">{' '|str_repeat:($folder.depth*2)}{$folder.name}</option>
+ {/foreach}
+
+ </select>
+ </div>
{/if}
- {/foreach}
- </section>
- {if $file.references}
- <section class="media_file_referer">
- <h4>{$CONST.REFERER}</h4>
- <ul>
- {foreach from=$file.references item="ref"}
- <li>({$ref.name|escape}) <a rel="nofollow" href="{$ref.link|escape}">{$ref.link|default:$CONST.NONE|escape}</a></li>
+ </section>
+
+ <section class="media_file_keywords">
+ <h4>{$CONST.MEDIA_KEYWORDS}</h4>
+
+ <ul class="clearfix plainList">
+ {foreach from=$file.base_keywords key="keyword_row" item="keyword_cells"}
+ {foreach from=$keyword_cells key="keyword_cell" item="keyword"}
+ {if $keyword.name}
+
+ <li>
+ <input id="mediaKeyword{$keyword.name}{$mediakey}" name="serendipity[mediaKeywords][{$mediakey}][{$keyword.name}]" type="checkbox" value="true"{if $keyword.selected} checked="checked"{/if}>
+ <label for="mediaKeyword{$keyword.name}{$mediakey}">{$keyword.name|truncate:20:"…"}</label>
+ </li>
+ {/if}
+ {/foreach}
+ {/foreach}
+
+ </ul>
+ </section>
+
+ <section class="media_file_metadata clearfix">
+ <h4>EXIF/IPTC/XMP</h4>
+ {foreach from=$file.metadata key="meta_type" item="meta_data"}
+
+ <h5>{$meta_type}</h5>
+ {if is_array($meta_data)}
+
+ <dl class="clearfix">
+ {foreach from=$meta_data key="meta_name" item="meta_value"}
+
+ <dt>{$meta_name}</dt>
+ <dd>{if is_array($meta_value)}{$meta_value|print_r}{else}{$meta_value|formatTime:DATE_FORMAT_SHORT:false:$meta_name}{/if}</dd>
+ {/foreach}
+
+ </dl>
+ {else}
+
+ <p>{$meta_data|formatTime:DATE_FORMAT_SHORT:false:$meta_type}</p>
+ {/if}
{/foreach}
- </ul>
- </section>
+
+ </section>
+ {if $file.references}
+ <section class="media_file_referer">
+
+ <h4>{$CONST.REFERER}</h4>
+
+ <ul>
+ {foreach from=$file.references item="ref"}
+
+ <li>({$ref.name|escape}) <a rel="nofollow" href="{$ref.link|escape}">{$ref.link|default:$CONST.NONE|escape}</a></li>
+ {/foreach}
+
+ </ul>
+ </section>
+ {/if}
+
+ </article>
{/if}
- </article>
- {/if}
{/foreach}