mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-30 17:50:12 +02:00
Code Issues Releases Wiki Activity

Bootstrap Label fix. TinyMce upgraded to 4.1

Browse Source
This commit is contained in:
Cameron
2015-07-19 23:12:49 -07:00
parent 2ec557794d
commit 385275344c
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/tinymce4/e_footer.php
View File

@@ -19,7 +19,7 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
//e107::js('tinymce','tiny_mce.js','jquery');
//e107::js('tinymce','wysiwyg.php','jquery',5);
e107::js('footer', "http://tinymce.cachefly.net/4.1/tinymce.min.js");
e107::js('footer', "http://tinymce.cachefly.net/4.2/tinymce.min.js");
e107::js('footer',e_PLUGIN.'tinymce4/wysiwyg.php','jquery',5);
// e107::js('inline', "
// tinymce.init({selector:'.e-wysiwyg'});
@@ -36,7 +36,7 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
if(ADMIN)
{
$insert = "$('#'+id).after('<div>";
$insert .= "<a href=\"#\" id=\"' + id + '\" class=\"e-wysiwyg-toggle btn btn-inverse btn-mini\">Switch to bbcode<\/a>";
$insert .= "<a href=\"#\" id=\"' + id + '\" class=\"e-wysiwyg-toggle btn btn-xs btn-default btn-inverse btn-mini\">Switch to bbcode<\/a>";
if(e_PAGE == 'mailout.php')
{

3
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -550,7 +550,8 @@ class wysiwyg
$ret['extended_smileys'] = json_encode($emotes);
}
// $ret['skin'] = 'e107admin';
// $ret['skin_url'] = SITEURLBASE.e_PLUGIN_ABS.'tinymce4/skins/e107admin';