diff options
author | Morris Jobke <hey@morrisjobke.de> | 2015-09-30 10:49:48 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2015-09-30 10:49:48 +0200 |
commit | 1051a3c6f5891e703a15225e12bbb9417755a860 (patch) | |
tree | 42309f8969042a29e2274e1b3d89da5a97dc322b /apps | |
parent | db79ba547aaf4e3c8ab732aece11f8d738ebad95 (diff) | |
download | nextcloud-server-1051a3c6f5891e703a15225e12bbb9417755a860.tar.gz nextcloud-server-1051a3c6f5891e703a15225e12bbb9417755a860.zip |
Change small thumbnails to 32 px
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/js/filelist.js | 4 | ||||
-rw-r--r-- | apps/files/templates/list.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/ajax/publicpreview.php | 4 | ||||
-rw-r--r-- | apps/files_sharing/js/public.js | 4 | ||||
-rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index b4cc71e2d3b..16aa643d11b 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1408,10 +1408,10 @@ generatePreviewUrl: function(urlSpec) { urlSpec = urlSpec || {}; if (!urlSpec.x) { - urlSpec.x = this.$table.data('preview-x') || 36; + urlSpec.x = this.$table.data('preview-x') || 32; } if (!urlSpec.y) { - urlSpec.y = this.$table.data('preview-y') || 36; + urlSpec.y = this.$table.data('preview-y') || 32; } urlSpec.x *= window.devicePixelRatio; urlSpec.y *= window.devicePixelRatio; diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index bbbce8473de..7ebf80ee8b2 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -51,7 +51,7 @@ <p></p> </div> -<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36"> +<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="32" data-preview-y="32"> <thead> <tr> <th id='headerName' class="hidden column-name"> diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php index 6ddd4786c2a..69894bb8da5 100644 --- a/apps/files_sharing/ajax/publicpreview.php +++ b/apps/files_sharing/ajax/publicpreview.php @@ -28,8 +28,8 @@ OCP\JSON::checkAppEnabled('files_sharing'); \OC_User::setIncognitoMode(true); $file = array_key_exists('file', $_GET) ? (string) $_GET['file'] : ''; -$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36'; -$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36'; +$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '32'; +$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '32'; $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true; $token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : ''; $keepAspect = array_key_exists('a', $_GET) ? true : false; diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 6a6095317af..1c3d4b9ac32 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -161,10 +161,10 @@ OCA.Sharing.PublicApp = { this.fileList.generatePreviewUrl = function (urlSpec) { urlSpec = urlSpec || {}; if (!urlSpec.x) { - urlSpec.x = 36; + urlSpec.x = 32; } if (!urlSpec.y) { - urlSpec.y = 36; + urlSpec.y = 32; } urlSpec.x *= window.devicePixelRatio; urlSpec.y *= window.devicePixelRatio; diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 2a9df94988d..840fd4fa146 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -908,6 +908,6 @@ class Trashbin { * @return string */ public static function preview_icon($path) { - return \OCP\Util::linkToRoute('core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => $path)); + return \OCP\Util::linkToRoute('core_ajax_trashbin_preview', array('x' => 32, 'y' => 32, 'file' => $path)); } } |