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

Fixed Positioning, fixed formatting for both mobile and desktop. 

Tooltips still frustrate me-
And the updated code with tabs nicely. yay.
This commit is contained in:
luckydonald 2014-08-13 11:40:36 +02:00
parent 159747117f
commit 5e86ff6d85
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/css/upload.css
View File

@ -71,9 +71,9 @@
#uploadprogressbar .label {
top: 6px;
opacity: 1;
overflow: hidden;
white-space: nowrap;
font-weight: normal;
overflow: hidden;
white-space: nowrap;
font-weight: normal;
}
#uploadprogressbar .label.inner {
color:white;

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

@ -487,12 +487,43 @@ OC.Upload = {
}
var smoothRemaining = (bufferTotal/bufferSize);
var date = new Date(smoothRemaining * 1000);
var stringRemaining = (date.getUTCHours() > 0 ? ('0' + date.getUTCHours()).slice(-2) + ':':'') +
('0' + date.getUTCMinutes()).slice(-2) + ':' +
('0' + date.getUTCSeconds()).slice(-2);
$('#uploadprogressbar .label .mobile').text(t('files', '{loadedSize}', {loadedSize: humanFileSize(data.loaded)}));
$('#uploadprogressbar .label .desktop').text(t('files', '{loadedSize} of {totalSize}', {loadedSize: humanFileSize(data.loaded), totalSize: humanFileSize(data.total)}));
$('#uploadprogressbar').attr('title', t('files', '{bitrate}. {timeRemaining} seconds remaining.', {timeRemaining: stringRemaining, bitrate: humanFileSize(data.bitrate) + '/s'}));
var timeStringMobile = "";
var timeStringDesktop = "";
if(date.getUTCHours()>0){
timeStringDesktop = t('files', '{hours}:{minutes}:{seconds} Hour{plural_s} left' , {
hours:date.getUTCHours(),
minutes: ('0' + date.getUTCMinutes()).slice(-2),
seconds: ('0' + date.getUTCSeconds()).slice(-2),
plural_s: (!(date.getUTCHours()== 1 && date.getUTCMinutes()== 0 && date.getUTCSeconds()== 0) ? "s": "")
});
timeStringMobile = t('files', '{hours}:{minutes}:{seconds}h' , {
hours:date.getUTCHours(),
minutes: ('0' + date.getUTCMinutes()).slice(-2),
seconds: ('0' + date.getUTCSeconds()).slice(-2)
});
} else if(date.getUTCMinutes()>0){
timeStringDesktop = t('files', '{minutes}:{seconds} Minute{plural_s} left' , {
minutes: date.getUTCMinutes(),
seconds: ('0' + date.getUTCSeconds()).slice(-2),
plural_s: (!(date.getUTCMinutes()== 1 && date.getUTCSeconds()== 0)? "s": "")
});
timeStringMobile = t('files', '{minutes}:{seconds}min' , {
minutes: date.getUTCMinutes(),
seconds: ('0' + date.getUTCSeconds()).slice(-2)
});
} else if(date.getUTCSeconds()>0){
timeStringDesktop = t('files', '{seconds} Second{plural_s} left' , {
seconds: date.getUTCSeconds(),
plural_s: (!date.getUTCSeconds()== 1 ? "s": "")
});
timeStringMobile = t('files', '{seconds}s' , {seconds: date.getUTCSeconds()});
} else {
timeStringDesktop = t('files', 'Any moment now...');
timeStringMobile = t('files', 'Soon...');
}
$('#uploadprogressbar .label .mobile').text(timeStringMobile);//t('files', '{loadedSize}', {loadedSize: humanFileSize(data.loaded)}));
$('#uploadprogressbar .label .desktop').text(timeStringDesktop);//
$('#uploadprogressbar').attr('title', t('files', '{loadedSize} of {totalSize} ({bitrate})', {loadedSize: humanFileSize(data.loaded), totalSize: humanFileSize(data.total), bitrate: humanFileSize(data.bitrate) + '/s'}));
$('#uploadprogressbar').progressbar('value', progress);
});
fileupload.on('fileuploadstop', function(e, data) {