diff options
| author | luckydonald <luckydonald@flutterb.at> | 2014-08-11 02:37:01 +0200 |
|---|---|---|
| committer | luckydonald <luckydonald@flutterb.at> | 2014-08-11 02:37:01 +0200 |
| commit | 7fc574cc537fe295cc6821765a5cf675b6c740fd (patch) | |
| tree | 008c209b2bd192cd7bf4cfa8798beef34b8fd887 /apps/files/js | |
| parent | 19efa259e9846555c06f08560ab01328c5422b99 (diff) | |
| download | nextcloud-server-7fc574cc537fe295cc6821765a5cf675b6c740fd.tar.gz nextcloud-server-7fc574cc537fe295cc6821765a5cf675b6c740fd.zip | |
Updated and optimized Mobile Layout as well.
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/file-upload.js | 5 |
1 files changed, 3 insertions, 2 deletions
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('<em class="label inner">' + t('files', 'Uploading...') + '</em>'); + $('#uploadprogressbar .ui-progressbar-value').html('<em class="label inner"><span class="desktop">' + t('files', 'Uploading...') + '</span><span class="mobile">' + t('files', '...') + '</span></em>'); 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); }); |