qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:s9y/additional_plugins

Browse source
This commit is contained in:
Garvin Hicking 2013-06-27 17:08:02 +02:00
commit cd53cffb10
3 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
serendipity_event_ckeditor/ChangeLog
View file

@ -1,3 +1,7 @@
1.2.2:
-----
* Added Serendipity Media Library
1.2.1:
-----
* Fixed bug in upgrade check

BIN
serendipity_event_ckeditor/img/mls9y.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 922 B

32
serendipity_event_ckeditor/serendipity_event_ckeditor.php
View file

@ -101,8 +101,8 @@ class serendipity_event_ckeditor extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_CKEDITOR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Rustam Abdullaev, Ian');
$propbag->add('version', '1.2.1');
$propbag->add('copyright', 'GPL & LGPL License');
$propbag->add('version', '1.2.2');
$propbag->add('copyright', 'GPL or LGPL License');
$propbag->add('requirements', array(
'serendipity' => '1.7',
'smarty' => '3.1.13',
@ -359,8 +359,19 @@ class serendipity_event_ckeditor extends serendipity_event
command: '<?php echo $button['id']; ?>'
});
<?php
} // close foreach
} // close foreach - follow up ML button into 'other' toolbar needs no textarea GET name, since the right instance dropping is done by this plugin
?>
editor.addCommand( 'openML', {
exec : function( editor ) {
window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
}
});
editor.ui.addButton('openML', {
label: 'S9yMedia',
title: 'Serendipity Media Library',
command: 'openML',
icon: '<?php echo serendipity_rewriteURL('plugins/serendipity_event_ckeditor/img/mls9y.png'); ?>'
});
}
});
<?php
@ -411,8 +422,19 @@ class serendipity_event_ckeditor extends serendipity_event
command: '<?php echo $button['id']; ?>'
});
<?php
} // close foreach
} // close foreach - follow up ML button into 'other' toolbar needs no textarea GET name, since the right instance dropping is done by this plugin
?>
editor.addCommand( 'openML', {
exec : function( editor ) {
window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
}
});
editor.ui.addButton('openML', {
label: 'S9yMedia',
title: 'Serendipity Media Library',
command: 'openML',
icon: '<?php echo serendipity_rewriteURL('plugins/serendipity_event_ckeditor/img/mls9y.png'); ?>'
});
}
});
<?php
@ -430,7 +452,7 @@ class serendipity_event_ckeditor extends serendipity_event
}
</script>
<?php
// kcfinder has a fallback media library mode if not properly loaded, or an other error occurs - get rid of it by default!
// kcfinder has a fallback media library mode if not properly loaded, or an other error occurs - get rid of it by default, since it stops image browser executing!
if( is_file(dirname(__FILE__) . '/kcfinder/.htaccess') ) {
@unlink(dirname(__FILE__) . '/kcfinder/.htaccess');
$this->empty_dir(dirname(__FILE__) . '/kcfinder/.thumbs');