APICHANGE: removed SWFUpload. Refactored Content Editors uploader to …

…use standard uploader. (from r97489)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102718 467b73ca-7a2a-4603-9d3b-597d59a354a9

code/AssetAdmin.php

@@ -59,10 +59,6 @@ function init() {
 		if(!file_exists(ASSETS_PATH)) Filesystem::makeFolder(ASSETS_PATH);
 
 		Requirements::javascript(CMS_DIR . "/javascript/AssetAdmin.js");
-		Requirements::javascript(CMS_DIR . "/javascript/CMSMain_upload.js");
-		Requirements::javascript(CMS_DIR . "/javascript/Upload.js");
-		Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/swfupload/swfupload/swfupload.js");
-
 		Requirements::css(CMS_DIR . "/css/AssetAdmin.css");
 
 		Requirements::customScript(<<<JS
@@ -104,8 +100,6 @@ function uploadiframe() {
 	 * Return the form object shown in the uploadiframe.
 	 */
 	function UploadForm() {
-		// disabled flash upload javascript (CMSMain_upload()) below,
-		// see r54952 (originally committed in r42014)
 		$form = new Form($this,'UploadForm', new FieldSet(
 			new HiddenField("ID", "", $this->currentPageID()),
 			new HiddenField("FolderID", "", $this->currentPageID()),

code/LeftAndMain.php

@@ -287,9 +287,6 @@ function init() {
 				'sapphire/thirdparty/scriptaculous/controls.js',
 				'cms/javascript/LeftAndMain.js',
 				'sapphire/javascript/tree/tree.js',
-				'sapphire/thirdparty/swfupload/swfupload/swfupload.js',
-				'cms/javascript/Upload.js',
-				'cms/javascript/TinyMCEImageEnhancement.js',
 				'sapphire/javascript/TreeSelectorField.js',
 		 		'cms/javascript/ThumbnailStripField.js',
 			)

css/cms_right.css

@@ -538,4 +538,30 @@
  */
 #ui-datepicker-div {
 	z-index: 1002;
-}
+}
+
+/**
+ * Upload Image (Image Toolbar)
+ */
+#Form_EditorToolbarImageForm .file,
+#Form_EditorToolbarImageForm #UploadFormResponse {
+	display: none;
+}
+
+.showUploadField {
+	font-size: 11px;
+	padding: 1px 3px;
+}
+	.showUploadField a {
+		display: none;
+	}
+
+	#UploadFormResponse {
+		padding: 6px 0;
+		font-size: 12px;
+	}
+		#UploadFormResponse.loading
+		.loading#UploadFormResponse {
+			background: url(../../cms/images/network-save.gif) no-repeat left center;
+			padding-left: 20px;
+		}