add translation strings & add margin to uploaded files-list
Signed-off-by: Christopher Mueller <chrinimue@posteo.me>
This commit is contained in:
parent
0c14c9d7ea
commit
79320200cc
|
@ -139,7 +139,7 @@ thead {
|
||||||
|
|
||||||
#public-upload #emptycontent ul {
|
#public-upload #emptycontent ul {
|
||||||
width: 230px;
|
width: 230px;
|
||||||
margin: 5px auto;
|
margin: 5px auto 5vh;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,6 @@
|
||||||
|
|
||||||
$('#drop-uploaded-files').append(output({isUploading: true, name: data.files[0].name}));
|
$('#drop-uploaded-files').append(output({isUploading: true, name: data.files[0].name}));
|
||||||
$('[data-toggle="tooltip"]').tooltip();
|
$('[data-toggle="tooltip"]').tooltip();
|
||||||
$('#drop-upload-status').text('waiting...');
|
|
||||||
data.submit();
|
data.submit();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -90,14 +89,13 @@
|
||||||
sequentialUploads: true,
|
sequentialUploads: true,
|
||||||
start: function(e) {
|
start: function(e) {
|
||||||
self._uploading = true;
|
self._uploading = true;
|
||||||
$('#drop-upload-status').text('starting');
|
|
||||||
},
|
},
|
||||||
stop: function(e) {
|
stop: function(e) {
|
||||||
self._uploading = false;
|
self._uploading = false;
|
||||||
},
|
},
|
||||||
add: function(e, data) {
|
add: function(e, data) {
|
||||||
Drop.addFileToUpload(e, data);
|
Drop.addFileToUpload(e, data);
|
||||||
$('#drop-upload-status').text('waiting...');
|
$('#drop-upload-status').text(t('files_sharing', 'waiting...'));
|
||||||
//we return true to keep trying to upload next file even
|
//we return true to keep trying to upload next file even
|
||||||
//if addFileToUpload did not like the privious one
|
//if addFileToUpload did not like the privious one
|
||||||
return true;
|
return true;
|
||||||
|
@ -114,6 +112,7 @@
|
||||||
'Could not upload "{filename}"',
|
'Could not upload "{filename}"',
|
||||||
{filename: data.files[0].name}
|
{filename: data.files[0].name}
|
||||||
));
|
));
|
||||||
|
$('#drop-upload-status').text(t('files_sharing', 'error'));
|
||||||
var errorIconSrc = OC.imagePath('core', 'actions/error.svg');
|
var errorIconSrc = OC.imagePath('core', 'actions/error.svg');
|
||||||
var fileItem = output({isUploading: false, iconSrc: errorIconSrc, name: data.files[0].name});
|
var fileItem = output({isUploading: false, iconSrc: errorIconSrc, name: data.files[0].name});
|
||||||
Drop.updateFileItem(data.files[0].name, fileItem);
|
Drop.updateFileItem(data.files[0].name, fileItem);
|
||||||
|
@ -132,7 +131,7 @@
|
||||||
var progress = parseInt(data.loaded / data.total * 100, 10);
|
var progress = parseInt(data.loaded / data.total * 100, 10);
|
||||||
if(progress === 100) {
|
if(progress === 100) {
|
||||||
$('#drop-upload-progress-bar').val(100);
|
$('#drop-upload-progress-bar').val(100);
|
||||||
$('#drop-upload-status').text('finished');
|
$('#drop-upload-status').text(t('files_sharing', 'finished'));
|
||||||
} else {
|
} else {
|
||||||
$('#drop-upload-progress-bar').val(progress);
|
$('#drop-upload-progress-bar').val(progress);
|
||||||
$('#drop-upload-status').text(progress + '%');
|
$('#drop-upload-status').text(progress + '%');
|
||||||
|
|
|
@ -99,7 +99,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
|
||||||
|
|
||||||
<input type="file" name="files[]" class="hidden" multiple>
|
<input type="file" name="files[]" class="hidden" multiple>
|
||||||
<a href="#" class="button icon-upload"><?php p($l->t('Select or drop files')) ?></a>
|
<a href="#" class="button icon-upload"><?php p($l->t('Select or drop files')) ?></a>
|
||||||
<div id="drop-upload-progress-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploading files')) ?></div>
|
<div id="drop-upload-progress-indicator" style="padding-top: 25px;" class="hidden"><span class="icon-loading-small"></span><?php p($l->t('Uploading files')) ?></div>
|
||||||
<div id="drop-upload-done-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploaded files:')) ?></div>
|
<div id="drop-upload-done-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploaded files:')) ?></div>
|
||||||
<ul id="drop-uploaded-files"></ul>
|
<ul id="drop-uploaded-files"></ul>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue