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

use magnific everywhere (#52)

Browse Source
This commit is contained in:
onli
2013-08-19 01:38:48 +02:00
parent e51dae3b9f
commit d0e74392fe
4 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
templates/2k11/admin/category.inc.tpl
View File

@ -123,6 +123,7 @@
<input class="standalone" name="SAVE" type="submit" value="{$save}">
</form>
<script src="{serendipity_getFile file='admin/js/jquery.magnific-popup.js'}"></script>
{/if}
{if $view}
<h2>{$CONST.CATEGORY_INDEX}:</h2>

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

@ -172,7 +172,7 @@ window.log = function f(){ log.history = log.history || []; log.history.push(arg
// Opens media db image selection in new window
serendipity.choose_media = function(id) {
window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=' + id + '&serendipity[filename_only]=true', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
serendipity.openPopup('serendipity_admin_image_selector.php?serendipity[htmltarget]=' + id + '&serendipity[filename_only]=true');
}
// "Transfer" value from media db popup to form element, used for example for selecting a category-icon
@ -277,12 +277,17 @@ window.log = function f(){ log.history = log.history || []; log.history.push(arg
imgWidth = f['imgThumbWidth'].value;
imgHeight = f['imgThumbHeight'].value;
}
if (parent.self.opener == undefined) {
// in iframes, there is no opener, and the magnific popup is wrapped
parent.self = window.parent.parent.$.magnificPopup;
parent.self.opener = window.parent.parent;
}
if (f['serendipity[filename_only]']) {
// this part is used when selecting only the image without further markup (-> category-icon)
var starget = f['serendipity[htmltarget]'] ? f['serendipity[htmltarget]'].value : 'serendipity[' + textarea + ']';
switch(f['serendipity[filename_only]'].value) {
case 'true':
parent.self.opener.serendipity.serendipity_imageSelector_addToElement(img, f['serendipity[htmltarget]'].value);
@ -355,15 +360,9 @@ window.log = function f(){ log.history = log.history || []; log.history.push(arg
+ '<div class="serendipity_imageComment_txt">' + comment + '</div>'
+ '</div>';
}
{if $use_popups}
parent.self.opener.serendipity.serendipity_imageSelector_addToBody(img, textarea);
parent.self.close();
{else}
// in iframes, there is no opener, and the magnific popup is wrapped
window.parent.parent.serendipity.serendipity_imageSelector_addToBody(img, textarea);
window.parent.parent.$.magnificPopup.close()
{/if}
parent.self.opener.serendipity.serendipity_imageSelector_addToBody(img, textarea);
parent.self.close();
}
// Toggle extended entry editor
@ -892,13 +891,11 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
// NOTE: This is just to replace the old functionality; ideally, this should
// have a working no-js fallback
if($('body').has('#category_icon').size() > 0) {
$('<button id="insert_image" name="insImage" title="{$CONST.MEDIA_LIBRARY}"><span class="icon-picture"></span><span class="visuallyhidden"> {$CONST.MEDIA_LIBRARY}</span></button>').insertAfter('#category_icon');
$('<button id="insert_image" type="button" name="insImage" title="{$CONST.MEDIA_LIBRARY}"><span class="icon-picture"></span><span class="visuallyhidden"> {$CONST.MEDIA_LIBRARY}</span></button>').insertAfter('#category_icon');
}
$('#insert_image').click(function(e) {
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');
serendipity.openPopup('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');
});
$('#category_icon').change(function() {

1
templates/2k11/admin/templates.inc.tpl
View File

@ -22,6 +22,7 @@
<p>{$CONST.STYLE_OPTIONS_NONE}</p>
{/if}
</section>
<script src="{serendipity_getFile file='admin/js/jquery.magnific-popup.js'}"></script>
{else}
<section id="template_select">
{assign var="cur_tpl" value=$templates[$cur_template]}

14
templates/2k11/admin/wysiwyg_init.tpl
View File

@ -7,18 +7,7 @@
init: function( editor ) {
editor.addCommand( 'openML', {
exec : function( editor ) {
{if $use_popups}
window.open('serendipity_admin_image_selector.php?serendipity[textarea]={$item}',
'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]={$item}'
},
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]={$item}');
}
});
editor.ui.addButton('s9y_medialibrary{$item}', {
@ -26,6 +15,7 @@
command: 'openML',
icon: '{serendipity_getFile file="admin/img/thumbnail.png"}'
});
}
});
CKEDITOR.replace($('#'+serendipity.escapeBrackets('{$item}')).get(0), {