Skip to content
This repository
Browse code

BUGFIX: SSF-38 fixing the "Choose files from your computer" upload field

  • Loading branch information...
commit 7f8a682ad7f9cd3df73223542f81c3c4326c0f45 1 parent 875eef9
Julian Seidenberg authored April 04, 2012
1  admin/css/screen.css
@@ -498,6 +498,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
498 498
 .htmleditorfield-linkform .step2 { margin-bottom: 16px; }
499 499
 
500 500
 .htmleditorfield-mediaform .ss-gridfield tbody td:first-child img { max-height: 30px; }
  501
+.htmleditorfield-mediaform .ss-uploadfield-editandorganize { display: none; }
501 502
 .htmleditorfield-mediaform .ss-htmleditorfield-file { border: 1px solid #b3b3b3; -moz-border-radius: 5px; -webkit-border-radius: 5px; -o-border-radius: 5px; -ms-border-radius: 5px; -khtml-border-radius: 5px; border-radius: 5px; -moz-background-clip: padding; -webkit-background-clip: padding; -o-background-clip: padding-box; -ms-background-clip: padding-box; -khtml-background-clip: padding-box; background-clip: padding-box; background: #E2E2E2; margin-bottom: 16px; }
502 503
 .htmleditorfield-mediaform .ss-htmleditorfield-file.loading { width: 100%; height: 100px; background-image: url(../images/spinner.gif); background-position: 50% 50%; background-repeat: no-repeat; }
503 504
 .htmleditorfield-mediaform .ss-htmleditorfield-file .overview { background-color: #5db4df; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzVkYjRkZiIvPjxzdG9wIG9mZnNldD0iOCUiIHN0b3AtY29sb3I9IiM1ZGIxZGQiLz48c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iIzQzOWJjYiIvPjxzdG9wIG9mZnNldD0iNTQlIiBzdG9wLWNvbG9yPSIjM2Y5OWNkIi8+PHN0b3Agb2Zmc2V0PSI5NiUiIHN0b3AtY29sb3I9IiMyMDdkYjYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMxZTdjYmEiLz48L2xpbmVhckdyYWRpZW50PjwvZGVmcz48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJ1cmwoI2dyYWQpIiAvPjwvc3ZnPiA='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5db4df), color-stop(8%, #5db1dd), color-stop(50%, #439bcb), color-stop(54%, #3f99cd), color-stop(96%, #207db6), color-stop(100%, #1e7cba)); background-image: -webkit-linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); background-image: -moz-linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); background-image: -o-linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); background-image: -ms-linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); background-image: linear-gradient(top, #5db4df 0%, #5db1dd 8%, #439bcb 50%, #3f99cd 54%, #207db6 96%, #1e7cba 100%); }
4  admin/scss/_style.scss
@@ -1343,6 +1343,10 @@ body.cms-dialog {
1343 1343
 		}
1344 1344
 	}
1345 1345
 
  1346
+	.ss-uploadfield-editandorganize {
  1347
+		display: none;
  1348
+	}
  1349
+
1346 1350
 	// TODO Consolidate with .assetuploadfield and .ss-uploadfield styles
1347 1351
 	.ss-htmleditorfield-file {
1348 1352
 		border: 1px solid lighten($color-medium-separator, 20%);
9  javascript/HtmlEditorField.js
@@ -700,13 +700,8 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
700 700
 		 * Show the second step after uploading an image
701 701
 		 */
702 702
 		$('form.htmleditorfield-form.htmleditorfield-mediaform div.ss-assetuploadfield').entwine({
703  
-			onmatch: function() {
704  
-				this._super();
705  
-
706  
-				// Always hide the "second step" part, we don't need it here
707  
-				this.find('.ss-uploadfield-editandorganize').hide();
708  
-
709  
-			},
  703
+			//the UploadField div.ss-uploadfield-editandorganize is hidden in CSS,
  704
+			// because we use the detail view for each individual file instead
710 705
 			onfileuploadstop: function(e) {
711 706
 				var form = this.closest('form');
712 707
 

0 notes on commit 7f8a682

Please sign in to comment.
Something went wrong with that request. Please try again.