diff options
| author | luckydonald <luckydonald@flutterb.at> | 2014-08-10 23:45:06 +0200 |
|---|---|---|
| committer | luckydonald <luckydonald@flutterb.at> | 2014-08-10 23:45:06 +0200 |
| commit | 19efa259e9846555c06f08560ab01328c5422b99 (patch) | |
| tree | 249aa08819f56091f5c11ec6b62c7c2a4cbd8a9a | |
| parent | 03a34235e05263fef239af54369f007d8db96257 (diff) | |
| download | nextcloud-server-19efa259e9846555c06f08560ab01328c5422b99.tar.gz nextcloud-server-19efa259e9846555c06f08560ab01328c5422b99.zip | |
Fixed translations, indentation and renamed the .percents class to .speed class.
| -rw-r--r-- | apps/files/css/upload.css | 4 | ||||
| -rw-r--r-- | apps/files/js/file-upload.js | 10 | ||||
| -rw-r--r-- | apps/files/templates/list.php | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index 1b572963ff3..71b8b580462 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -59,7 +59,7 @@ width: 200px; height: 36px; display:inline-block; - text-align: center; + text-align: center; } #uploadprogressbar .ui-progressbar-value.ui-widget-header.ui-corner-left { height: 100%; @@ -83,7 +83,7 @@ position: relative; color: black; } -#uploadprogresswrapper .percents{ +#uploadprogresswrapper .speed{ margin-left: 3px; font-size: 13px; display:inline-block; diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 36bdc589745..4dc7d0be30f 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -181,7 +181,7 @@ OC.Upload = { _hideProgressBar: function() { $('#uploadprogresswrapper input.stop').fadeOut(); - $('#uploadprogresswrapper .percents').fadeOut(); + $('#uploadprogresswrapper .speed').fadeOut(); $('#uploadprogressbar').fadeOut(function() { $('#file_upload_start').trigger(new $.Event('resized')); }); @@ -455,10 +455,10 @@ OC.Upload = { fileupload.on('fileuploadstart', function(e, data) { OC.Upload.log('progress handle fileuploadstart', e, data); $('#uploadprogresswrapper input.stop').show(); - $('#uploadprogresswrapper .percents').show(); + $('#uploadprogresswrapper .speed').show(); $('#uploadprogresswrapper .label').show(); $('#uploadprogressbar').progressbar({value: 0}); - $('#uploadprogressbar .ui-progressbar-value').html('<em class="label inner">Uploading...</em>'); + $('#uploadprogressbar .ui-progressbar-value').html('<em class="label inner">' + t('files', 'Uploading...') + '</em>'); OC.Upload._showProgressBar(); }); fileupload.on('fileuploadprogress', function(e, data) { @@ -468,8 +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(humanFileSize(data.loaded) + " of " + humanFileSize(data.total)); - $('#uploadprogresswrapper .percents').text(humanFileSize(data.bitrate) + '/s') + $('#uploadprogressbar .label').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); }); fileupload.on('fileuploadstop', function(e, data) { diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index a25172679a2..af616d71c19 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -38,10 +38,10 @@ </div> <div id="uploadprogresswrapper"> <div id="uploadprogressbar"> - <em class="label outer" style="display:none">Uploading...</em> + <em class="label outer" style="display:none"><?php p($l->t('Uploading...'));?></em> </div> - <div style="display:none" class="percents"></div> - <input type="button" class="stop icon-close" style="display:none" value="" /> + <div style="display:none" class="speed"></div> + <input type="button" class="stop icon-close" style="display:none" value="" /> </div> </div> <div id="file_action_panel"></div> |