'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button...

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index c9e92eeea8d148ed050b662559fd7fbb869bc2f8..ec323915b4431a6b67b979f0f2b863a39fc61557 100644 (file)
--- 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 c15422d28b6dc8b74b2f4194cfd4632aaa635af6..311aa0e880240945e796c73bedc36465fa0b593a 100644 (file)
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -296,7 +296,7 @@ $(document).ready(function() {
 
                                        //show cancel button
                                        if(data.dataType !== 'iframe') {
-                                               $('#upload input.stop').show();
+                                               $('#uploadprogresswrapper input.stop').show();
                                        }
                                },
                                /**
@@ -310,9 +310,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' ) {
@@ -387,7 +384,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.