From dac875eb9c99365367f8f1f15da40c7228c466ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 28 Mar 2013 18:50:49 +0100
Subject: [PATCH] '#upload' is actually '#uploadprogresswrapper', fix css and
 js to show cancel button correctly

---
 apps/files/css/files.css | 6 +++++-
 apps/files/js/files.js   | 7 ++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 4d2b16e6f1..3b1c268fa0 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -45,7 +45,11 @@
 }
 
 #uploadprogresswrapper { float: right; position: relative; }
-#uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
+#uploadprogresswrapper #uploadprogressbar {
+	position:relative; float: right;
+	margin-left: 12px; width:10em; height:1.5em; top:.4em;
+	display:inline-block;
+}
 
 /* FILE TABLE */
 
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index b4f85dc720..5060fe93f1 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -291,7 +291,7 @@ $(document).ready(function() {
 
 					//show cancel button
 					if(data.dataType !== 'iframe') {
-						$('#upload input.stop').show();
+						$('#uploadprogresswrapper input.stop').show();
 					}
 				},
 				/**
@@ -305,9 +305,6 @@ $(document).ready(function() {
 					}
 					$('#uploadprogressbar').progressbar({value:0});
 					$('#uploadprogressbar').fadeIn();
-					if(data.dataType != 'iframe ') {
-						$('#upload input.stop').show();
-					}
 				},
 				fail: function(e, data) {
 					if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
@@ -382,7 +379,7 @@ $(document).ready(function() {
 				 */
 				stop: function(e, data) {
 					if(data.dataType !== 'iframe') {
-						$('#upload input.stop').hide();
+						$('#uploadprogresswrapper input.stop').hide();
 					}
 
 					//IE < 10 does not fire the necessary events for the progress bar.