diff options
| -rw-r--r-- | include/photos.php | 8 | ||||
| -rw-r--r-- | view/js/main.js | 5 | ||||
| -rwxr-xr-x | view/tpl/cropbody.tpl | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/include/photos.php b/include/photos.php index c0917ce28..240f3d1c4 100644 --- a/include/photos.php +++ b/include/photos.php @@ -193,8 +193,8 @@ function photo_upload($channel, $observer, $args) { unset($p['os_storage']); unset($p['os_path']); - if(($width > 640 || $height > 640) && (! $errors)) { - $ph->scaleImage(640); + if(($width > 1024 || $height > 1024) && (! $errors)) { + $ph->scaleImage(1024); $p['scale'] = 1; $r2 = $ph->save($p); $smallest = 1; @@ -202,8 +202,8 @@ function photo_upload($channel, $observer, $args) { $errors = true; } - if(($width > 320 || $height > 320) && (! $errors)) { - $ph->scaleImage(320); + if(($width > 640 || $height > 640) && (! $errors)) { + $ph->scaleImage(640); $p['scale'] = 2; $r3 = $ph->save($p); $smallest = 2; diff --git a/view/js/main.js b/view/js/main.js index 0c26e3d57..c7a85eea4 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -745,13 +745,14 @@ function justifyPhotos() { selector: '> a, > div:not(.spinner, #page-end)', margins: 3, border: 0, + rowHeight: 180, sizeRangeSuffixes: { 'lt100': '-2', 'lt240': '-2', 'lt320': '-2', 'lt500': '', - 'lt640': '-1', - 'lt1024': '-0' + 'lt640': '-2', + 'lt1024': '-1' } }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl index 4794c0b83..01d9a24a0 100755 --- a/view/tpl/cropbody.tpl +++ b/view/tpl/cropbody.tpl @@ -27,8 +27,8 @@ previewWrap: 'previewWrap', minWidth: 300, minHeight: 300, - maxWidth: 640, - maxHeight: 640, + maxWidth: 1024, + maxHeight: 1024, ratioDim: { x: 100, y:100 }, displayOnInit: true, onEndCrop: onEndCrop |