mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

MDL-42660 TinyMCE: Shuffle icons in default toolbar layout

Browse Source
This commit is contained in:
Jason Fowler 2013-11-06 12:14:02 +08:00 committed by Damyon Wiese
parent f2b8eb222a
commit 2106d4b351
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/editor/tinymce/db/upgrade.php
View File

@ -135,5 +135,17 @@ fontselect,fontsizeselect,wrap,code,search,replace,|,cleanup,removeformat,pastet
upgrade_plugin_savepoint(true, 2013102900, 'editor', 'tinymce');
}
if ($oldversion < 2013110600) {
// Reset redesigned editor toolbar setting.
$currentorder = get_config('editor_tinymce', 'customtoolbar');
// Start with a wrap.
// Remove the nonbreaking,charmap,table buttons (to be placed else where).
$neworder = str_replace(",wrap,nonbreaking,charmap,table", "", $currentorder);
// Place the nonbreaking,charmap,table button where they belongs.
$neworder = str_replace("search,replace", "search,replace,wrap,nonbreaking,charmap,table", $neworder);
set_config('customtoolbar', $neworder, 'editor_tinymce');
upgrade_plugin_savepoint(true, 2013110600, 'editor', 'tinymce');
}
return true;
}

2
lib/editor/tinymce/settings.php
View File

@ -33,7 +33,7 @@ if ($ADMIN->fulltree) {
$settings->add(new admin_setting_heading('tinymcegeneralheader', new lang_string('settings'), ''));
$default = "wrap,formatselect,wrap,bold,italic,wrap,bullist,numlist,wrap,link,unlink,wrap,image
undo,redo,wrap,underline,strikethrough,sub,sup,wrap,justifyleft,justifycenter,justifyright,wrap,outdent,indent,wrap,forecolor,backcolor,wrap,ltr,rtl,wrap
undo,redo,wrap,underline,strikethrough,sub,sup,wrap,justifyleft,justifycenter,justifyright,wrap,outdent,indent,wrap,forecolor,backcolor,wrap,ltr,rtl
fontselect,fontsizeselect,wrap,code,search,replace,wrap,nonbreaking,charmap,table,wrap,cleanup,removeformat,pastetext,pasteword,wrap,fullscreen";
$settings->add(new admin_setting_configtextarea('editor_tinymce/customtoolbar',

2
lib/editor/tinymce/version.php
View File

@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2013110500; // The current plugin version (Date: YYYYMMDDXX)
$plugin->version = 2013110600; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2013110500; // Requires this Moodle version
$plugin->component = 'editor_tinymce'; // Full name of the plugin (used for diagnostics)
$plugin->release = '3.5.8'; // This is NOT a directory name, see lib.php if you need to know where is the editor code!