diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-03-28 18:50:49 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-03-28 18:50:49 +0100 |
| commit | dac875eb9c99365367f8f1f15da40c7228c466ab (patch) | |
| tree | f0f839e3af25e0fdc9185e58d6415f32f04965b3 /apps | |
| parent | e31d74037ad0e7be60393bc5c6c5b74ef686dd94 (diff) | |
| download | nextcloud-server-dac875eb9c99365367f8f1f15da40c7228c466ab.tar.gz nextcloud-server-dac875eb9c99365367f8f1f15da40c7228c466ab.zip | |
'#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel button correctly
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/css/files.css | 6 | ||||
| -rw-r--r-- | 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 4d2b16e6f1c..3b1c268fa09 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 b4f85dc720a..5060fe93f1d 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. |