diff options
| -rw-r--r-- | apps/files_sharing/css/public.css | 37 | ||||
| -rw-r--r-- | apps/files_sharing/js/public.js | 2 | ||||
| -rw-r--r-- | apps/files_sharing/js/sharedfilelist.js | 9 | ||||
| -rw-r--r-- | apps/files_sharing/lib/api.php | 6 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 4 |
5 files changed, 45 insertions, 13 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 04c482d10e4..97c9696ad59 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -89,21 +89,48 @@ thead { } /* within #save */ +#save .save-form { + position: relative; +} + #remote_address { margin: 0; + width: 130px; height: 14px; padding: 6px; + padding-right: 24px; +} + +.ie8 #remote_address { + padding-right: 30px; } -#save button { +#save #save-button, +#save #save-button-confirm { margin: 0 5px; height: 28px; padding-bottom: 4px; line-height: 14px; } -#save .save-form [type="submit"] { - margin: 0 5px; - height: 28px; - padding-bottom: 4px; +#save-button-confirm { + position: absolute; + background-color: transparent; + border: none; + margin: 2px 4px !important; + right: 0; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; +} + +.ie8 #save-button-confirm { + margin: 2px 0 !important; +} + +#save-button-confirm:hover, +#save-button-confirm:focus { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter: alpha(opacity=100); + opacity: 1; } diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index a5027da0cfb..2c68f440756 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -163,7 +163,7 @@ OCA.Sharing.PublicApp = { OCA.Sharing.PublicApp._saveToOwnCloud(remote, token, owner, name, isProtected); }); - $('#save > button').click(function () { + $('#save #save-button').click(function () { $(this).hide(); $('.save-form').css('display', 'inline'); $('#remote_address').focus(); diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index 304f77a8d77..ea9071cfcb8 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -166,11 +166,10 @@ } else { file.type = 'file'; - // force preview retrieval as we don't have mime types, - // the preview endpoint will fall back to the mime type - // icon if no preview exists - file.isPreviewAvailable = true; - file.icon = true; + if (share.isPreviewAvailable) { + file.icon = true; + file.isPreviewAvailable = true; + } } file.share = { id: share.id, diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php index 2e824a4a9df..50ba74f5beb 100644 --- a/apps/files_sharing/lib/api.php +++ b/apps/files_sharing/lib/api.php @@ -60,6 +60,9 @@ class Api { foreach ($shares as &$share) { if ($share['item_type'] === 'file' && isset($share['path'])) { $share['mimetype'] = \OC_Helper::getFileNameMimeType($share['path']); + if (\OC::$server->getPreviewManager()->isMimeSupported($share['mimetype'])) { + $share['isPreviewAvailable'] = true; + } } $newShares[] = $share; } @@ -214,6 +217,9 @@ class Api { foreach ($shares as &$share) { if ($share['item_type'] === 'file') { $share['mimetype'] = \OC_Helper::getFileNameMimeType($share['file_target']); + if (\OC::$server->getPreviewManager()->isMimeSupported($share['mimetype'])) { + $share['isPreviewAvailable'] = true; + } } } $result = new \OC_OCS_Result($shares); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 2476beac1fb..386fa7e17cd 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -19,10 +19,10 @@ <div class="header-right"> <span id="details"> <span id="save" data-protected="<?php p($_['protected'])?>" data-owner="<?php p($_['displayName'])?>" data-name="<?php p($_['filename'])?>"> - <button><?php p($l->t('Add to your ownCloud')) ?></button> + <button id="save-button"><?php p($l->t('Add to your ownCloud')) ?></button> <form class="save-form hidden" action="#"> <input type="text" id="remote_address" placeholder="example.com/owncloud"/> - <input type="submit" value="<?php p($l->t('Save')) ?>"/> + <button id="save-button-confirm" class="icon-confirm svg"></button> </form> </span> <a href="<?php p($_['downloadURL']); ?>" id="download" class="button"> |