Commit 0ed41724 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Remove the old tinymce maharaimage plugin. Bug 1452480"

parents a5812949 ba0e6ea3
......@@ -144,7 +144,7 @@ $othernotesmsg = '<div class="warning">' . get_string('textusedinothernotes', '
$smarty = smarty(array(), array(), array(), array(
'tinymceconfig' => '
plugins: "tooltoggle,textcolor,link,maharaimage,table,emoticons,spellchecker,paste,code,fullscreen,directionality,searchreplace,nonbreaking,charmap",
plugins: "tooltoggle,textcolor,link,imagebrowser,table,emoticons,spellchecker,paste,code,fullscreen,directionality,searchreplace,nonbreaking,charmap",
image_filebrowser: "editnote_filebrowser",
',
'sideblocks' => array(
......
......@@ -128,7 +128,7 @@ EOF;
$smarty = smarty(array(), array(), array(), array(
'tinymceconfig' => '
plugins: "tooltoggle,textcolor,link,maharaimage,table,emoticons,spellchecker,paste,code,fullscreen,directionality,searchreplace,nonbreaking,charmap",
plugins: "tooltoggle,textcolor,link,imagebrowser,table,emoticons,spellchecker,paste,code,fullscreen,directionality,searchreplace,nonbreaking,charmap",
image_filebrowser: "editgoalsandskills_filebrowser",
',
'sideblocks' => array(
......
......@@ -13,5 +13,4 @@ Changes:
* Removed all files in 'classes' directory since they're packaged into tinymce.js
* Removed all .less files from skin
* Added code to spellchecker/spellchecker.rpc to use $CFG->spellcheckerengine
* Added maharaimage plugin (supports adding attachments)
* Adjusted the charmap plugin to contain Māori macrons
\ No newline at end of file
* Adjusted the charmap plugin to contain Māori macrons
......@@ -1172,7 +1172,7 @@ It provides users with tools to create and maintain a digital portfolio of their
// Form change checker
$string['wanttoleavewithoutsaving?'] = 'You have made changes - do you want to leave the page without saving them?';
// TinyMCE maharaimage plugin
// Image browser
$string['attachedimage'] = 'Attached image';
$string['imagebrowsertitle'] = 'Insert or select an image';
$string['imagebrowserdescription'] = 'Paste the URL of an external image, or use the image browser below to select or upload your own image.';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment