From 09ef2f09636658783b9ddec9d861f9ab65c6552b Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 16 Sep 2007 02:21:47 +0000 Subject: [PATCH] mujma: ENHANCEMENT: Added photo upload in TinyMCE editor. (merged from branches/gsoc) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42045 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/LeftAndMain.php | 5 + code/ThumbnailStripField.php | 2 +- css/TinyMCEImageEnhancement.css | 26 ++ javascript/ThumbnailStripField.js | 7 +- javascript/TinyMCEImageEnhancement.js | 331 ++++++++++++++++++++++++++ 5 files changed, 367 insertions(+), 4 deletions(-) create mode 100644 css/TinyMCEImageEnhancement.css create mode 100644 javascript/TinyMCEImageEnhancement.js diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 8aae2440..469d82fe 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -78,6 +78,11 @@ abstract class LeftAndMain extends Controller { Requirements::css("sapphire/css/SubmittedFormReportField.css"); + Requirements::css('cms/css/TinyMCEImageEnhancement.css'); + Requirements::javascript("jsparty/SWFUpload/SWFUpload.js"); + Requirements::javascript("sapphire/javascript/Security_login.js"); + Requirements::javascript('cms/javascript/TinyMCEImageEnhancement.js'); + $dummy = null; $this->extend('augmentInit', $dummy); } diff --git a/code/ThumbnailStripField.php b/code/ThumbnailStripField.php index cf3721a8..c22cb4c8 100755 --- a/code/ThumbnailStripField.php +++ b/code/ThumbnailStripField.php @@ -48,7 +48,7 @@ class ThumbnailStripField extends FormField { array_unshift($folderList, $folder->ID); - $images = DataObject::get("Image", "ParentID IN (" . implode(', ', $folderList) . ")"); + $images = DataObject::get("Image", "ParentID IN (" . implode(', ', $folderList) . ")","Created"); if($images) { $result .= '