tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Moved EditorToolbar() from CMSMain to LeftAndMain (as we don't support loading link forms via ajax)

Browse Source
This commit is contained in:
Ingo Schommer 2012-01-03 18:09:40 +01:00
parent b4b6e5a2db
commit 1ec694d0a9
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/code/LeftAndMain.php
View File

@ -227,6 +227,7 @@ class LeftAndMain extends Controller {
array( array(
THIRDPARTY_DIR . '/prototype/prototype.js', THIRDPARTY_DIR . '/prototype/prototype.js',
THIRDPARTY_DIR . '/behaviour/behaviour.js', THIRDPARTY_DIR . '/behaviour/behaviour.js',
SAPPHIRE_DIR . '/javascript/prototype_improvements.js',
THIRDPARTY_DIR . '/jquery/jquery.js', THIRDPARTY_DIR . '/jquery/jquery.js',
SAPPHIRE_DIR . '/javascript/jquery_improvements.js', SAPPHIRE_DIR . '/javascript/jquery_improvements.js',
THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js', THIRDPARTY_DIR . '/jquery-livequery/jquery.livequery.js',
@ -256,6 +257,8 @@ class LeftAndMain extends Controller {
SAPPHIRE_DIR . '/javascript/Validator.js', SAPPHIRE_DIR . '/javascript/Validator.js',
SAPPHIRE_DIR . '/javascript/i18n.js', SAPPHIRE_DIR . '/javascript/i18n.js',
SAPPHIRE_ADMIN_DIR . '/javascript/ssui.core.js', SAPPHIRE_ADMIN_DIR . '/javascript/ssui.core.js',
SAPPHIRE_DIR . '/javascript/tiny_mce_improvements.js',
CMS_DIR . '/javascript/ThumbnailStripField.js',
) )
); );
@ -974,6 +977,13 @@ class LeftAndMain extends Controller {
return $this->redirect(Controller::join_links($this->Link('show'), $record->ID)); return $this->redirect(Controller::join_links($this->Link('show'), $record->ID));
} }
} }
/**
* Return the CMS's HTML-editor toolbar
*/
public function EditorToolbar() {
return Object::create('HtmlEditorField_Toolbar', $this, "EditorToolbar");
}
/** /**
* Batch Actions Handler * Batch Actions Handler