mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6239 from nextcloud/fix-uploading-message 

Show "Uploading..." in web UI for long uploads
This commit is contained in:
Roeland Jago Douma 2017-08-23 19:15:58 +02:00 committed by GitHub
parent 9357cf735a 57fd256b9a
commit 697fcc93da
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files/js/file-upload.js
View File

@ -971,9 +971,9 @@ OC.Uploader.prototype = _.extend({
$('#uploadprogressbar').progressbar({value: 0});
$('#uploadprogressbar .ui-progressbar-value').
html('<em class="label inner"><span class="desktop">'
+ t('files', 'Uploading...')
+ t('files', 'Uploading …')
+ '</span><span class="mobile">'
+ t('files', '...')
+ t('files', '…')
+ '</span></em>');
$('#uploadprogressbar').tooltip({placement: 'bottom'});
self._showProgressBar();
@ -1021,6 +1021,10 @@ OC.Uploader.prototype = _.extend({
}
var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();
if (!(smoothRemainingSeconds >= 0 && smoothRemainingSeconds < 14400)) {
// show "Uploading ..." for durations longer than 4 hours
h = t('files', 'Uploading …');
}
$('#uploadprogressbar .label .mobile').text(h);
$('#uploadprogressbar .label .desktop').text(h);
$('#uploadprogressbar').attr('original-title',

2
apps/files/templates/list.php
View File

@ -2,7 +2,7 @@
<div class="actions creatable hidden">
<div id="uploadprogresswrapper">
<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>
<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>