diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-02-05 11:27:46 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-02-05 11:27:46 +0100 |
| commit | a3b351738a7ccdd153fa06ba5dc5594e471f9124 (patch) | |
| tree | b0e80678cf58ad7de80a672cfc89cd1355749eb6 /apps/files_sharing | |
| parent | 37f8607a883ad1bac698da5f2e7ab7c362c2ef48 (diff) | |
| download | nextcloud-server-a3b351738a7ccdd153fa06ba5dc5594e471f9124.tar.gz nextcloud-server-a3b351738a7ccdd153fa06ba5dc5594e471f9124.zip | |
Instead of 'No preview available for ...' we simple display the mime-type icon
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/js/public.js | 9 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 22 |
2 files changed, 10 insertions, 21 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index d95f6348ac0..730649c6378 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -15,14 +15,7 @@ $(document).ready(function() { if (mimetype.substr(0, mimetype.indexOf('/')) != 'image' && $('.publicpreview').length === 0) { // Trigger default action if not download TODO var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ); - if (typeof action === 'undefined') { - $('#noPreview').show(); - if (mimetype != 'httpd/unix-directory') { - // NOTE: Remove when a better file previewer solution exists - $('#content').remove(); - $('table').remove(); - } - } else { + if (typeof action !== 'undefined') { action($('#filename').val()); } } diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index fb45401458f..652cd74eaff 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -16,7 +16,7 @@ <div class="header-right"> <span id="details"><?php p($l->t('shared by %s', array($_['displayName']))) ?></span> </div> - </div></header> +</div></header> <div id="content"> <div id="preview"> <?php if (isset($_['folder'])): ?> @@ -32,16 +32,10 @@ <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> </video> </div> - <?php elseif (\OC\Preview::isMimeSupported($_['mimetype'])): ?> + <?php else: ?> <div id="imgframe"> <img src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => 500, 'y' => 500, 'file' => urlencode($_['directory_path']), 't' => $_['dirToken']))); ?>" class="publicpreview"/> </div> - <?php else: ?> - <ul id="noPreview"> - <li class="error"> - <?php p($l->t('No preview available for').' '.$_['filename']); ?><br /> - </li> - </ul> <?php endif; ?> <div class="directDownload"> <a href="<?php p($_['downloadURL']); ?>" id="download" class="button"> @@ -55,8 +49,10 @@ </div> <?php endif; ?> </div> - <footer> - <p class="info"> - <?php print_unescaped($theme->getLongFooter()); ?> - </p> - </footer> + +</div> +<footer> + <p class="info"> + <?php print_unescaped($theme->getLongFooter()); ?> + </p> +</footer> |