From 7fc574cc537fe295cc6821765a5cf675b6c740fd Mon Sep 17 00:00:00 2001 From: luckydonald Date: Mon, 11 Aug 2014 02:37:01 +0200 Subject: Updated and optimized Mobile Layout as well. --- apps/files/js/file-upload.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apps/files/js/file-upload.js') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 4dc7d0be30f..d3ee64bb50d 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -458,7 +458,7 @@ OC.Upload = { $('#uploadprogresswrapper .speed').show(); $('#uploadprogresswrapper .label').show(); $('#uploadprogressbar').progressbar({value: 0}); - $('#uploadprogressbar .ui-progressbar-value').html('' + t('files', 'Uploading...') + ''); + $('#uploadprogressbar .ui-progressbar-value').html('' + t('files', 'Uploading...') + '' + t('files', '...') + ''); OC.Upload._showProgressBar(); }); fileupload.on('fileuploadprogress', function(e, data) { @@ -468,7 +468,8 @@ OC.Upload = { fileupload.on('fileuploadprogressall', function(e, data) { OC.Upload.log('progress handle fileuploadprogressall', e, data); var progress = (data.loaded / data.total) * 100; - $('#uploadprogressbar .label').text(t('files', '{loadedSize} of {totalSize}', {loadedSize: humanFileSize(data.loaded), totalSize: humanFileSize(data.total)})); + $('#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)})); $('#uploadprogresswrapper .speed').text(t('files', '{bitrate}/s', {bitrate: humanFileSize(data.bitrate)})); $('#uploadprogressbar').progressbar('value', progress); }); -- cgit v1.2.3