diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-05-12 18:15:54 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-05-12 18:15:54 +0200 |
| commit | 5f6fb4570430184dd9849b457cbec44c1b328ca4 (patch) | |
| tree | aea69fb7459df57c653d3dd432ca29556c2ee205 /apps/files/templates/list.php | |
| parent | e077d78ec98a992530661e3801fbdaf43198d187 (diff) | |
| parent | cacf5ed23f74524e537b5c51a55f4a406a7fa5fb (diff) | |
| download | nextcloud-server-5f6fb4570430184dd9849b457cbec44c1b328ca4.tar.gz nextcloud-server-5f6fb4570430184dd9849b457cbec44c1b328ca4.zip | |
Merge branch 'Superduper-Progressbar-branch-thingie' of https://github.com/luckydonald/core into luckydonald-Superduper-Progressbar-branch-thingie
Diffstat (limited to 'apps/files/templates/list.php')
| -rw-r--r-- | apps/files/templates/list.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 29769bcd825..dda7a1814a0 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -1,12 +1,10 @@ <div id="controls"> <div class="actions creatable hidden"> <div id="uploadprogresswrapper"> - <div id="uploadprogressbar"></div> - <button class="stop icon-close" style="display:none"> - <span class="hidden-visually"> - <?php p($l->t('Cancel upload'))?> - </span> - </button> + <div id="uploadprogressbar"> + <em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...'));?></span><span class="mobile"><?php p($l->t('...'));?></span></em> + </div> + <input type="button" class="stop icon-close" style="display:none" value="" /> </div> </div> <div id="file_action_panel"></div> |