version 0.1.3

Author: engram-design

README.md

@@ -14,7 +14,12 @@ Image Resizer works for all Asset Sources: Local, Rackspace Cloud Files, Amazon
 - Enable/Disable resizing images on upload. Enabled by default.
 - Set the maximum width/height (in pixels) for uploaded images. Set to 2048px by default.
 - Set the quality for resized images between 0-100. Set to 100 by default.
-- Select which Asset sources you want resizing to be performed on.
+- If resizing results in a larger image, choose to ship. Enabled by default.
+
+All the above options can be modified per-asset source.
+
+- Bulk resizing for asset folders.
+- Cropping aspect ratios.
 
 
 ## Resizing
@@ -36,16 +41,20 @@ You'll be presented with a warning screen advising that the selected images will
 
 Under the hood, the batch processing is run through Craft's Tasks service, which will allow you to process plenty of images at once, without timing out or running into memory issues.
 
+Additionally, using the plugin settings page (Bulk Resize tab), you can bulk-resize all assets in a single folder. 
+
 
 ## Cropping
 
 You can crop any image through the Assets Index screen, by clicking on the Actions button, and selecting Crop image. You can only crop one image at a time. There are several preset options related to the aspect ratio to control how cropping is controlled, and are selected through the Crop modal window.
 
 Activating the cropping interface upon upload of new images is on the Roadmap, and will be released soon.
 
+You can manage these aspect ratios through the plugin settings page, including removing/renaming existing options, or adding your own.
+
 <img src="https://raw.githubusercontent.com/engram-design/ImageResizer/master/screenshots/cropping.png" width="400" />
 
-Aspect ratio options are:
+Default aspect ratio options are:
 
 - **Free:** No restrictions 
 - **Square:** Restricted to square crop
@@ -56,8 +65,6 @@ Aspect ratio options are:
 ## Roadmap
 
 - Provide cropping options on-upload.
-- Allow Asset folder selection in addition to source.
-- Provide hook for third-party Aspect Ratio options.
 - Add more features for full-featured image editor.
 
 

changelog.json

@@ -1,4 +1,16 @@
 [
+    {
+        "version": "0.1.3",
+        "downloadUrl": "https://github.com/engram-design/ImageResizer/archive/0.1.3.zip",
+        "date": "2016-06-24T14:15:00+10:00",
+        "notes": [
+            "[Added] You can now specify width and height sizes on-demand in the Resizing modal window.",
+            "[Added] Resizing can be done on an entire folder through Image Resizer settings (Bulk Resize tab).",
+            "[Added] Allow custom aspect ratios to be defined for cropping.",
+            "[Improved] Resizing now checks if the resulting file size is larger than the original. If larger, no action is taken.",
+            "[Improved] You can now specify per-asset source settings, with fallbacks to your global settings."
+        ]
+    },
     {
         "version": "0.1.2",
         "downloadUrl": "https://github.com/engram-design/ImageResizer/archive/0.1.2.zip",

imageresizer/ImageResizerPlugin.php

@@ -14,7 +14,7 @@ public function getName()
 
     public function getVersion()
     {
-        return '0.1.2';
+        return '0.1.3';
     }
 
     public function getSchemaVersion()
@@ -50,13 +50,17 @@ public function getReleaseFeedUrl()
     public function getSettingsHtml()
     {
         $sourceOptions = array();
-
+        $folderOptions = array();
         foreach (craft()->assetSources->getAllSources() as $source) {
             $sourceOptions[] = array('label' => $source->name, 'value' => $source->id);
         }
 
+        $assetTree = craft()->assets->getFolderTreeBySourceIds(craft()->assetSources->getAllSourceIds());
+        craft()->imageResizer->getAssetFolders($assetTree, $folderOptions);
+
         return craft()->templates->render('imageresizer/settings', array(
             'settings' => $this->getSettings(),
+            'folderOptions' => $folderOptions,
             'sourceOptions' => $sourceOptions,
         ));
     }
@@ -68,7 +72,33 @@ protected function defineSettings()
             'imageWidth' => array( AttributeType::Number, 'default' => '2048' ),
             'imageHeight' => array( AttributeType::Number, 'default' => '2048' ),
             'imageQuality' => array( AttributeType::Number, 'default' => '100' ),
-            'assetSources' => array( AttributeType::Mixed, 'default' => '*' ),
+            'assetSources' => array( AttributeType::Mixed, 'default' => '*' ), // Deprecated
+            'assetSourceSettings' => array( AttributeType::Mixed ),
+            'skipLarger' => array( AttributeType::Bool, 'default' => true ),
+
+            // Cropping
+            'croppingRatios' => array( AttributeType::Mixed, 'default' => array(
+                array(
+                    'name' => 'Free',
+                    'width' => 'none',
+                    'height' => 'none',
+                ),
+                array(
+                    'name' => 'Square',
+                    'width' => 1,
+                    'height' => 1,
+                ),
+                array(
+                    'name' => 'Constrain',
+                    'width' => 'relative',
+                    'height' => 'relative',
+                ),
+                array(
+                    'name' => '4:3',
+                    'width' => 4,
+                    'height' => 3,
+                ),
+            ) ),
         );
     }
 
@@ -92,6 +122,10 @@ public function init()
             $folder = $event->params['folder'];
             $filename = $event->params['filename'];
 
+            // User for overrides on element action
+            $width = null;
+            $height = null;
+
             // If we've triggered this from our cropping action, don't resize too
             if (craft()->httpSession->get('ImageResizer_CropElementAction')) {
                 craft()->httpSession->remove('ImageResizer_CropElementAction');
@@ -100,26 +134,28 @@ public function init()
 
             // If this has been trigged from the element actions, bypass everything below
             if (!craft()->httpSession->get('ImageResizer_ResizeElementAction')) {
-                // Make sure we check out config setting
-                if (craft()->imageResizer->getSettings()->enabled) {
+                // We can have settings globally, or per asset source. Check!
+                $sourceEnabled = craft()->imageResizer->getSettingForAssetSource($folder->source->id, 'enabled');
 
-                    // Should we be modifying images in this source?
-                    $assetSources = craft()->imageResizer->getSettings()->assetSources;
-
-                    if ($assetSources != '*') {
-                        if (!in_array($folder->source->id, $assetSources)) {
-                            return true;
-                        }
-                    }
+                // Should we be modifying images in this source?
+                if (!$sourceEnabled) {
+                    return true;
                 }
             } else {
                 // If we are from a element action - delete this so it doesn't persist
                 craft()->httpSession->remove('ImageResizer_ResizeElementAction');
+
+                // We also might ne overriding width/height
+                $width = craft()->httpSession->get('ImageResizer_ResizeElementActionWidth');
+                $height = craft()->httpSession->get('ImageResizer_ResizeElementActionHeight');
+
+                craft()->httpSession->remove('ImageResizer_ResizeElementActionWidth');
+                craft()->httpSession->remove('ImageResizer_ResizeElementActionHeight');
             }
 
             // Is this a manipulatable image?
             if (ImageHelper::isImageManipulatable(IOHelper::getExtension($filename))) {
-                craft()->imageResizer_resize->resize($path);
+                craft()->imageResizer_resize->resize($folder->source->id, $path, $width, $height);
             }
         });
     }

imageresizer/controllers/ImageResizerController.php

@@ -9,10 +9,23 @@ public function actionResizeElementAction()
         $this->requireAjaxRequest();
         $this->requireAdmin();
 
-        $assetIds = craft()->request->getRequiredPost('assetIds');
+        $assetIds = craft()->request->getPost('assetIds');
+        $imageWidth = craft()->request->getPost('imageWidth');
+        $imageHeight = craft()->request->getPost('imageHeight');
+        $bulkResize = craft()->request->getPost('bulkResize');
+        $assetFolderId = craft()->request->getPost('assetFolderId');
+
+        if ($bulkResize) {
+            $criteria = craft()->elements->getCriteria(ElementType::Asset);
+            $criteria->limit = null;
+            $criteria->folderId = $assetFolderId;
+            $assetIds = $criteria->ids();
+        }
 
         craft()->tasks->createTask('ImageResizer', 'Resizing images', array(
             'assets' => $assetIds,
+            'imageWidth' => $imageWidth,
+            'imageHeight' => $imageHeight,
         ));
 
         craft()->end();

imageresizer/elementactions/ImageResizer_CropImageElementAction.php

@@ -13,8 +13,13 @@ public function getTriggerHtml()
         craft()->templates->includeJsResource('lib/jcrop/jquery.Jcrop.min.js');
         craft()->templates->includeCssResource('lib/jcrop/jquery.Jcrop.min.css');
 
+        $croppingRatios = craft()->imageResizer->getSettings()->croppingRatios;
+
         craft()->templates->includeCssResource('imageresizer/css/CropElementAction.css');
         craft()->templates->includeJsResource('imageresizer/js/CropElementAction.js');
-        craft()->templates->includeJs('new Craft.CropElementAction();');
+
+        craft()->templates->includeJs('new Craft.CropElementAction(' . 
+            ''.json_encode($croppingRatios).'' .
+        ');');
     }
 }

imageresizer/resources/css/ResizeElementAction.css

@@ -37,6 +37,10 @@
     position: absolute;
 }
 
+.image-resizer-modal .footer .buttons.rightalign {
+    float: right;
+}
+
 
 
 .image-resizer-modal .task {

imageresizer/resources/css/Settings.css

@@ -45,4 +45,7 @@
     margin-right: 10px;
 }
 
+.bulk-resize-table td {
+    padding: 5px 20px 5px 0;
+}
 

imageresizer/resources/js/CropElementAction.js

@@ -1,7 +1,7 @@
 (function() {
 Craft.CropElementAction = Garnish.Base.extend({
 
-    init: function() {
+    init: function(croppingRatios) {
         var cropTrigger = new Craft.ElementActionTrigger({
             handle: 'ImageResizer_CropImage',
             batch: false,
@@ -10,7 +10,7 @@ Craft.CropElementAction = Garnish.Base.extend({
                 return (documents > 0) ? false : true;
             },
             activate: function($selectedItems) {
-                new Craft.CropImageModal($selectedItems.find('.element'), $selectedItems, {});
+                new Craft.CropImageModal($selectedItems.find('.element'), $selectedItems, { croppingRatios: croppingRatios });
             }
         });
     },
@@ -37,6 +37,7 @@ Craft.CropImageModal = Garnish.Modal.extend(
     init: function($element, $selectedItems, settings) {
         this.$element = $element;
         this.$selectedItems = $selectedItems;
+        this.settings = settings;
 
         this.desiredWidth = 400;
         this.desiredHeight = 280;
@@ -74,13 +75,13 @@ Craft.CropImageModal = Garnish.Modal.extend(
     },
 
     setupAspectRatio: function() {
+        var menuOptions = '';
+        $.each(this.settings.croppingRatios, function(index, item) {
+            menuOptions += '<li><a data-action="' + index + '" data-width="' + item.width + '" data-height="' + item.height + '">' + Craft.t(item.name) + '</a></li>';
+        });
+
         var $menu = $('<div class="menu">' +
-            '<ul>' +
-                '<li><a data-action="free">'+Craft.t('Free')+'</a></li>' +
-                '<li><a data-action="square">'+Craft.t('Square')+'</a></li>' +
-                '<li><a data-action="constrain">'+Craft.t('Constrain')+'</a></li>' +
-                '<li><a data-action="4_3">'+Craft.t('4:3')+'</a></li>' +
-            '</ul>' +
+            '<ul>' + menuOptions + '</ul>' +
         '</div>').insertAfter(this.$aspectRatioSelect);
 
         var MenuButton = new Garnish.MenuBtn(this.$aspectRatioSelect, {
@@ -101,29 +102,17 @@ Craft.CropImageModal = Garnish.Modal.extend(
         var width = $img.width();
         var height = $img.height();
 
-        if ($option.data('action') == 'free') {
-            this.areaSelect.setOptions({ aspectRatio: null });
-        } else if ($option.data('action') == 'square') {
-            this.areaSelect.setOptions({ aspectRatio: 1 / 1 });
-
-            if (width > height) {
-                width = height;
-            } else {
-                height = width;
-            }
+        var action = $option.data('action');
+        var widthConstraint = $option.data('width');
+        var heightConstraint = $option.data('height');
 
-        } else if ($option.data('action') == 'constrain') {
-            this.areaSelect.setOptions({ aspectRatio: width / height });
-        } else if ($option.data('action') == '4_3') {
+        // Cater for special aspect ratio cases
+        if (widthConstraint == 'none') { widthConstraint = null; }
+        if (heightConstraint == 'none') { heightConstraint = null; }
+        if (widthConstraint == 'relative') { widthConstraint = width; }
+        if (heightConstraint == 'relative') { heightConstraint = height; }
 
-            this.areaSelect.setOptions({ aspectRatio: 4 / 3 });
-
-            if (width > height) {
-                width = Math.round((height / 3) * 4);
-            } else {
-                height = Math.round((width / 4) * 3);
-            }
-        }
+        this.areaSelect.setOptions({ aspectRatio: widthConstraint / heightConstraint });
     },
 
     onFadeOut: function() {