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

Drop use of serendipity_admin_image_selector.php

Browse Source 
Enhance admin/images.inc.tpl instead. Gets rid of the fieldset-construct (#30)
This commit is contained in:
onli
2013-07-23 03:06:27 +02:00
parent f744ef7464
commit 731b044d50
4 changed files with 94 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
templates/2k11/admin/media_items.tpl
View File

@ -3,29 +3,46 @@
<article class="media_wrap_thumb {cycle values="odd,even"}">
<div class="media_file_thumb{if $media.enclose} equal_heights{/if}">
{if $file.is_image AND $file.full_thumb}
{if $file.url}
<a href="{$file.url}&amp;serendipity[image]={$file.id}">
{if $media.textarea || $media.htmltarget}
<a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=choose&amp;serendipity[fid]={$file.id}&amp;serendipity[textarea]={$media.textarea}&amp;serendipity[noBanner]=true&amp;serendipity[noSidebar]=true&amp;serendipity[noFooter]=true&serendipity[filename_only]={$media.filename_only}&serendipity[htmltarget]={$media.htmltarget}">
{else}
{if $file.url}
<a href="{$file.url}&amp;serendipity[image]={$file.id}">
{/if}
{/if}
<img src="{$file.full_thumbHTTP}" title="{$file.path}{$file.name}" alt="{$file.realname}">
{if $file.url}
</a>
<img src="{$file.full_thumbHTTP}" title="{$file.path}{$file.name}" alt="{$file.realname}">
{if $media.textarea || $file.url}
</a>
{/if}
{elseif $file.is_image AND $file.hotlink}
{if $file.url}
<a href="{$file.$url}&amp;serendipity[image]={$file.id}">
{if $media.textarea}
<a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=choose&amp;serendipity[fid]={$file.id}&amp;serendipity[textarea]={$media.textarea}&amp;serendipity[noBanner]=true&amp;serendipity[noSidebar]=true&amp;serendipity[noFooter]=true&serendipity[filename_only]={$media.filename_only}&serendipity[htmltarget]={$media.htmltarget}"">
{else}
{if $file.url}
<a href="{$file.$url}&amp;serendipity[image]={$file.id}">
{/if}
{/if}
<img src="{$file.path}" width="{$file.thumbWidth}" height="{$file.thumbHeight}" title="{$file.path}" alt="{$file.realname}">
{if $file.url}
</a>
{if $media.textarea || $file.url}
</a>
{/if}
{else}
{if $file.url}
<a href="{$file.$url}&amp;serendipity[image]={$file.id}">
{if $media.textarea}
<a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=choose&amp;serendipity[fid]={$file.id}&amp;serendipity[textarea]={$media.textarea}&amp;serendipity[noBanner]=true&amp;serendipity[noSidebar]=true&amp;serendipity[noFooter]=true&serendipity[filename_only]={$media.filename_only}&serendipity[htmltarget]={$media.htmltarget}"">
{else}
{if $file.url}
<a href="{$file.$url}&amp;serendipity[image]={$file.id}">
{/if}
{/if}
<img src="{$file.mimeicon}" title="{$file.path}{$file.name}({$file.mime})" alt="{$file.mime}">
<span class="block_level">{if $file.hotlink}{$CONST.MEDIA_HOTLINKED}{else}{$file.mime}{/if}</span>
{if $file.url}
</a>
{if $media.textarea || $file.url}
</a>
{/if}
{/if}
{if $file.orderkey != ''}

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

@ -566,6 +566,22 @@ window.log = function f(){ log.history = log.history || []; log.history.push(arg
{/if}
}
serendipity.openPopup = function(url) {
{if $use_popups}
window.open(url,
'ImageSel',
'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
{else}
$.magnificPopup.open({
items: {
src: url
},
type: 'iframe'
});
{/if}
};
}( window.serendipity = window.serendipity || {}, jQuery ));
// Source: https://github.com/yatil/accessifyhtml5.js
@ -732,18 +748,7 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
});
$('.wrap_insmedia').click(function() {
{if $use_popups}
window.open('serendipity_admin_image_selector.php?serendipity[textarea]=' + $(this).attr('data-tarea'),
'ImageSel',
'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
{else}
$.magnificPopup.open({
items: {
src: 'serendipity_admin_image_selector.php?serendipity[textarea]=' + $(this).attr('data-tarea')
},
type: 'iframe'
});
{/if}
serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[textarea]=' + $(this).attr('data-tarea'));
});
// Entry preview
@ -852,9 +857,9 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
}
$('#insert_image').click(function(e) {
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');
window.open('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[htmltarget]=category_icon&serendipity[filename_only]=true',
'ImageSel',
'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
});
$('#category_icon').change(function() {