diff options
| -rw-r--r-- | apps/files/css/upload.css | 2 | ||||
| -rw-r--r-- | apps/files/js/file-upload.js | 6 | ||||
| -rw-r--r-- | apps/files/templates/list.php | 12 |
3 files changed, 12 insertions, 8 deletions
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index cc383879fb2..adf1e9d13f8 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -9,7 +9,7 @@ overflow: hidden; vertical-align: top; } -#upload a { +#upload .icon-upload { position: relative; display: block; width: 100%; diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 9fe623075bc..b5c8391e802 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -187,7 +187,7 @@ OC.Upload = { }, _hideProgressBar: function() { - $('#uploadprogresswrapper input.stop').fadeOut(); + $('#uploadprogresswrapper .stop').fadeOut(); $('#uploadprogressbar').fadeOut(function() { $('#file_upload_start').trigger(new $.Event('resized')); }); @@ -469,13 +469,13 @@ OC.Upload = { OC.Upload.log('progress handle fileuploadadd', e, data); //show cancel button //if (data.dataType !== 'iframe') { //FIXME when is iframe used? only for ie? - // $('#uploadprogresswrapper input.stop').show(); + // $('#uploadprogresswrapper .stop').show(); //} }); // add progress handlers fileupload.on('fileuploadstart', function(e, data) { OC.Upload.log('progress handle fileuploadstart', e, data); - $('#uploadprogresswrapper input.stop').show(); + $('#uploadprogresswrapper .stop').show(); $('#uploadprogressbar').progressbar({value: 0}); OC.Upload._showProgressBar(); }); diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 8ecec066a51..7d28016bd76 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -34,13 +34,17 @@ value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)"> <input type="file" id="file_upload_start" name='files[]' data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" /> - <a href="#" class="svg icon-upload"></a> + <label for="file_upload_start" class="svg icon-upload"> + <span class="hidden-visually"><?php p($l->t('Upload'))?></span> + </label> </div> <div id="uploadprogresswrapper"> <div id="uploadprogressbar"></div> - <input type="button" class="stop icon-close" - style="display:none" value="" - alt="<?php p($l->t('Cancel upload'))?>" /> + <button class="stop icon-close" style="display:none"> + <span class="hidden-visually"> + <?php p($l->t('Cancel upload'))?> + </span> + </button> </div> </div> <div id="file_action_panel"></div> |