diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-10 14:47:40 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-10 14:47:40 +0200 |
| commit | 54e2ac57130666add0ad5d3c583c6f29527b4ebc (patch) | |
| tree | 5c284d00ebd7daed6584dcc4922211223cd6d274 /apps/files_sharing | |
| parent | c49402d26640df2adfdf3201cfc9c4c1456b7a66 (diff) | |
| download | nextcloud-server-54e2ac57130666add0ad5d3c583c6f29527b4ebc.tar.gz nextcloud-server-54e2ac57130666add0ad5d3c583c6f29527b4ebc.zip | |
Add text about uploaded files
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/css/public.css | 2 | ||||
| -rw-r--r-- | apps/files_sharing/js/files_drop.js | 13 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 628fd45f242..c998501dad6 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -197,7 +197,7 @@ thead { #public-upload #emptycontent ul { width: 160px; - margin: 25px auto; + margin: 5px auto; text-align: left; } diff --git a/apps/files_sharing/js/files_drop.js b/apps/files_sharing/js/files_drop.js index c9dafb0564f..0a6a1c7567f 100644 --- a/apps/files_sharing/js/files_drop.js +++ b/apps/files_sharing/js/files_drop.js @@ -28,6 +28,8 @@ errors.push('File is too big'); } + $('#drop-upload-done-indicator').addClass('hidden'); + $('#drop-upload-progress-indicator').removeClass('hidden'); _.each(data['files'], function(file) { if(errors.length === 0) { $('#public-upload ul').append('<li data-toggle="tooltip" title="'+escapeHTML(file.name)+'" data-name="'+escapeHTML(file.name)+'"><span class="icon-loading-small"></span> '+escapeHTML(file.name)+'</li>'); @@ -37,7 +39,6 @@ OC.Notification.showTemporary(OC.L10N.translate('files_sharing', 'Could not upload "{filename}"', {filename: file.name})); $('#public-upload ul').append('<li data-toggle="tooltip" title="'+escapeHTML(file.name)+'" data-name="'+escapeHTML(file.name)+'"><img src="'+OC.imagePath('core', 'actions/error.svg')+'"/> '+escapeHTML(file.name)+'</li>'); $('[data-toggle="tooltip"]').tooltip(); - } }); }, @@ -47,6 +48,16 @@ $('#public-upload ul li[data-name="' + escapeHTML(response['filename']) + '"]').html('<img src="' + escapeHTML(mimeTypeUrl) + '"/> ' + escapeHTML(response['filename'])); $('[data-toggle="tooltip"]').tooltip(); } + }, + progressall: function (e, data) { + var progress = parseInt(data.loaded / data.total * 100, 10); + if(progress === 100) { + $('#drop-upload-done-indicator').removeClass('hidden'); + $('#drop-upload-progress-indicator').addClass('hidden'); + } else { + $('#drop-upload-done-indicator').addClass('hidden'); + $('#drop-upload-progress-indicator').removeClass('hidden'); + } } }); $('#public-upload .button.icon-upload').click(function(e) { diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 35adb240022..c15001ad24b 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -135,7 +135,9 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); <p><span class="icon-folder"></span> <?php p($_['filename']) ?></p> <input type="file" name="files[]" class="hidden" multiple> - <a href="#" class="button icon-upload"><?php p($l->t('Select')) ?></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-done-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploaded files:')) ?></div> <ul> </ul> </div> |