Changeset 1917 for plugins/apostrophePlugin/trunk

Timestamp:

08/08/10 12:18:34 (22 months ago)

Author:

tboutell

Message:

Merged the cropping branch back to trunk:

Cropping is now available in the media repository. Every time you select an image for use on the site you have the opportunity to crop it. The image size constraints of the slot are taken into account. This means that you can satisfy a given set of constraints by cropping a wide variety of images that would not have been eligible for selection before.

Crops of existing images appear in the database as separate aMediaItem objects but do not duplicate the original image file. This means that many crops of a single source image can exist without significant overhead.

The slug field of a cropped version of an image contains cropping parameters. When rendering the image, Symfony routes spot these and crop the original file as needed.

By approaching the problem this way we have avoided the need for code that takes advantage of the media repository's image selection capabilities to change in any way in order to take advantage of cropping.

The single-image-select behavior of Apostrophe has changed to accommodate the extra cropping step. Single select for PDFs and videos still uses the selectSingle partial because they cannot be cropped.

Thanks to Spike Broehm for his contributions to the cropping project.

Fixes #227

Location:

plugins/apostrophePlugin/trunk

Files:

• . (modified) (1 prop)
• config/doctrine/schema.yml (modified) (4 diffs)
• lib/action/BaseaMediaActions.class.php (modified) (10 diffs)
• lib/action/BaseaMediaBackendActions.class.php (modified) (3 diffs)
• lib/action/BaseaMediaComponents.class.php (modified) (1 diff)
• lib/action/BaseaSlideshowSlotComponents.class.php (modified) (1 diff)
• lib/model/doctrine/PluginaMediaItem.class.php (modified) (4 diffs)
• lib/model/doctrine/PluginaMediaItemTable.class.php (modified) (1 diff)
• lib/toolkit/aDimensions.class.php (modified) (2 diffs)
• lib/toolkit/aDoctrine.class.php (modified) (1 diff)
• lib/toolkit/aImageConverter.class.php (modified) (3 diffs)
• lib/toolkit/aImageConverterTest.php (modified) (1 diff)
• lib/toolkit/aMediaAPI.php (modified) (1 diff)
• lib/toolkit/aMediaRouting.php (modified) (2 diffs)
• lib/toolkit/aMediaSelect.class.php (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/lib/toolkit/aMediaSelect.class.php)
• lib/toolkit/aMediaTools.php (modified) (3 diffs)
• modules/aImageSlot/templates/_normalView.php (modified) (1 diff)
• modules/aMedia/templates/_browser.php (modified) (1 diff)
• modules/aMedia/templates/_describeConstraints.php (modified) (1 diff)
• modules/aMedia/templates/_mediaItem.php (modified) (1 diff)
• modules/aMedia/templates/_multipleList.php (modified) (5 diffs)
• modules/aMedia/templates/_multiplePreview.php (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/modules/aMedia/templates/_multiplePreview.php) (1 diff)
• modules/aMedia/templates/_selectMultiple.php (modified) (2 diffs)
• modules/aMedia/templates/_selectSingle.php (modified) (1 diff)
• modules/aMedia/templates/cropSuccess.php (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/modules/aMedia/templates/cropSuccess.php)
• modules/aMedia/templates/indexSuccess.php (modified) (3 diffs)
• modules/aMedia/templates/updateMultiplePreviewSuccess.php (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/modules/aMedia/templates/updateMultiplePreviewSuccess.php)
• modules/aSlideshowSlot/templates/_normalView.php (modified) (1 diff)
• modules/aVideoSlot/templates/_normalView.php (modified) (1 diff)
• web/css/Jcrop (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/web/css/Jcrop)
• web/css/Jcrop/Jcrop.gif (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/web/css/Jcrop/Jcrop.gif)
• web/css/Jcrop/jquery.Jcrop.css (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/web/css/Jcrop/jquery.Jcrop.css)
• web/css/a.css (modified) (9 diffs, 1 prop)
• web/css/jquery.Jcrop.css (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/web/css/jquery.Jcrop.css)
• web/images (modified) (1 prop)
• web/images/a-icon-crop.png (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/web/images/a-icon-crop.png)
• web/js/aCrop.js (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/web/js/aCrop.js)
• web/js/plugins/jquery.Jcrop.min.js (copied) (copied from plugins/apostrophePlugin/branches/features/cropping/web/js/plugins/jquery.Jcrop.min.js)

plugins/apostrophePlugin/trunk/config/doctrine/schema.yml

@@ -373 +373 @@
     Timestampable: ~
     Taggable: ~
+
+    # For virtual media items that are just croppings of others, we explicitly set slug.
+    # If this item is a crop of another item, the slug will
+    # look like this: original_slug.cropLeft.cropTop.cropWidth.cropHeight
+    # The aMediaBackend/image action then sees these extra
+    # parameters in the route and behaves accordingly
+    # and we can look directly at that file to finish the job
+    
+    # Otherwise we let the behavior do its job
+
     Sluggable:
       fields: [title]
@@ -378 +388 @@
       # We unified this
       builder: aTools::slugify
+
   columns:
     id:
@@ -404 +415 @@
     format:
       type: string(10)
+      
     # Preferred still image or video dimensions. For a still image
     # these are the dimensions of the original. For video they are
@@ -411 +423 @@
     height:
       type: integer(4)
-
+      
     # If this field is non-null, it contains HTML embed/object code to
     # be used without alteration (except for replacing _WIDTH_ and _HEIGHT_)

plugins/apostrophePlugin/trunk/lib/action/BaseaMediaActions.class.php

@@ -31 +31 @@
         }
 
+  // Supported for backwards compatibility. See also 
+  // aMediaSelect::select()
+  
   public function executeSelect(sfRequest $request)
   {
@@ -45 +48 @@
       $selection = array($request->getParameter('aMediaId') + 0);
     } 
-    $items = aMediaItemTable::retrieveByIds($selection);
-    $ids = array();
-    foreach ($items as $item)
-    {
-      $ids[] = $item->getId();
-    }
     $options = array();
     $optional = array('type', 'aspect-width', 'aspect-height',
@@ -61 +58 @@
       }
     }
-    aMediaTools::setSelecting($after, $multiple, $ids, $options);
+    aMediaTools::setSelecting($after, $multiple, $selection, $options);
       
     return $this->redirect("aMedia/index");
@@ -113 +110 @@
     $aspectWidth = floor(aMediaTools::getAttribute('aspect-width'));
     $aspectHeight = floor(aMediaTools::getAttribute('aspect-height'));
-    // TODO: performance of these is not awesome (it's a linear search). 
-    // It would be more awesome with the right kind of indexing. For the 
-    // aspect ratio test to be more efficient we'd have to store the lowest 
-    // common denominator aspect ratio and index that.
-    if ($aspectWidth && $aspectHeight)
-    {
-      $params['aspect-width'] = $aspectWidth;
-      $params['aspect-height'] = $aspectHeight;
-    }
-
-    $minimumWidth = floor(aMediaTools::getAttribute('minimum-width'));
-    if ($minimumWidth)
-    {
+
+    if ($type === 'image')
+    {
+      // Now that we provide cropping tools, width and height should only exclude images
+      // that are too small to ever be cropped to that size
+      $minimumWidth = floor(aMediaTools::getAttribute('minimum-width'));
+      $width = floor(aMediaTools::getAttribute('width'));
+      $minimumWidth = max($minimumWidth, $width);
+      $minimumHeight = floor(aMediaTools::getAttribute('minimum-height'));
+      $height = floor(aMediaTools::getAttribute('height'));
+      $minimumHeight = max($minimumHeight, $height);
+      // Careful, aspect ratio can impose a bound on the other dimension
+      if ($minimumWidth && $aspectWidth)
+      {
+        $minimumHeight = max($minimumHeight, $minimumWidth * $aspectHeight / $aspectWidth);
+      }
+      if ($minimumHeight && $aspectHeight)
+      {
+        $minimumWidth = max($minimumWidth, $minimumHeight * $aspectWidth / $aspectHeight);
+      }
+      // We've updated these with implicit constraints from the aspect ratio, the width and height params, etc.
+      aMediaTools::setAttribute('minimum-width', $minimumWidth);
+      aMediaTools::setAttribute('minimum-height', $minimumHeight);
       $params['minimum-width'] = $minimumWidth;
-    }
-    $minimumHeight = floor(aMediaTools::getAttribute('minimum-height'));
-    if ($minimumHeight)
-    {
       $params['minimum-height'] = $minimumHeight;
     }
-    $width = floor(aMediaTools::getAttribute('width'));
-    if ($width)
-    {
-      $params['width'] = $width;
-    }
-    $height = floor(aMediaTools::getAttribute('height'));
-    if ($height)
-    {
-      $params['height'] = $height;
-    }
-
+    else
+    {
+      // TODO: performance of these is not awesome (it's a linear search). 
+      // It would be more awesome with the right kind of indexing. For the 
+      // aspect ratio test to be more efficient we'd have to store the lowest 
+      // common denominator aspect ratio and index that.
+      if ($aspectWidth && $aspectHeight)
+      {
+        $params['aspect-width'] = $aspectWidth;
+        $params['aspect-height'] = $aspectHeight;
+      }
+
+      $minimumWidth = floor(aMediaTools::getAttribute('minimum-width'));
+      if ($minimumWidth)
+      {
+        $params['minimum-width'] = $minimumWidth;
+      }
+      $minimumHeight = floor(aMediaTools::getAttribute('minimum-height'));
+      if ($minimumHeight)
+      {
+        $params['minimum-height'] = $minimumHeight;
+      }
+      $width = floor(aMediaTools::getAttribute('width'));
+      if ($width)
+      {
+        $params['width'] = $width;
+      }
+      $height = floor(aMediaTools::getAttribute('height'));
+      if ($height)
+      {
+        $params['height'] = $height;
+      }
+    }
+    
     // The media module is now an engine module. There is always a page, and that
     // page might have a restricted set of categories associated with it
@@ -162 +188 @@
     $this->pager->init();
     $this->results = $this->pager->getResults();
+
     aMediaTools::setSearchParameters(
       array("tag" => $tag, "type" => $type, 
@@ -175 +202 @@
         $this->label = aMediaTools::getAttribute("label");
       }
-      $this->limitSizes = false;
-      if ($aspectWidth || $aspectHeight || $minimumWidth || $minimumHeight ||
-        $width || $height)
-      {
-        $this->limitSizes = true;
-      }
+      $this->limitSizes = ($minimumWidth || $minimumHeight);
     }
   }
@@ -215 +237 @@
       $parameters));
   }
-
+  
+  // Accept and store cropping information for a particular image which must already be part of the selection
+  public function executeCrop(sfRequest $request)
+  {
+    $selection = aMediaTools::getSelection();
+    $id = $request->getParameter('id');
+    $index = array_search($id, $selection);
+    if ($index === false)
+    {
+      error_log("ID is $id and not found in index which is " . implode(',', $selection));
+      $this->forward404();
+    }
+    $cropLeft = floor($request->getParameter('cropLeft'));
+    $cropTop = floor($request->getParameter('cropTop'));
+    $cropWidth = floor($request->getParameter('cropWidth'));
+    $cropHeight = floor($request->getParameter('cropHeight'));
+    $width = floor($request->getParameter('width'));
+    $height = floor($request->getParameter('height'));
+    $imageInfo = aMediaTools::getAttribute('imageInfo');
+    $imageInfo[$id]['cropLeft'] = $cropLeft;
+    $imageInfo[$id]['cropTop'] = $cropTop;
+    $imageInfo[$id]['cropWidth'] = $cropWidth;
+    $imageInfo[$id]['cropHeight'] = $cropHeight;
+    $imageInfo[$id]['width'] = $width;
+    $imageInfo[$id]['height'] = $height;
+    aMediaTools::setAttribute('imageInfo', $imageInfo);
+  }
+  
   public function executeMultipleAdd(sfRequest $request)
   {
-    $this->forward404Unless(aMediaTools::isMultiple());
     $id = $request->getParameter('id') + 0;
     $item = Doctrine::getTable("aMediaItem")->find($id);
     $this->forward404Unless($item); 
     $selection = aMediaTools::getSelection();
-    $index = array_search($id, $selection);
-    // One occurrence each. If this changes we'll have to rethink
-    // the way reordering and deletion work (probably go by index).
-    if ($index === false)
-    {
-      $selection[] = $id;
+    if (!aMediaTools::isMultiple())
+    {
+      $selection = array($id);
+    }
+    else
+    {
+      $index = array_search($id, $selection);
+      // One occurrence each. If this changes we'll have to rethink
+      // the way reordering and deletion work (probably go by index).
+      if ($index === false)
+      {
+        $selection[] = $id;
+      }
     }
     aMediaTools::setSelection($selection);
+    $imageInfo = aMediaTools::getAttribute('imageInfo');
+    // Make no attempt to scrub out a previous crop, which could be handy
+    $imageInfo[$id]['width'] = $item->getWidth();
+    $imageInfo[$id]['height'] = $item->getHeight();
+    aMediaTools::setAttribute('imageInfo', $imageInfo);
+    // If no previous crop info is set, we must set an intial cropping mask
+    // so that the cropped media item id gets linked instead of the original
+    // media item. This is a little dangerous because JavaScript computes an
+    // intial crop mask on the client side.
+    aMediaTools::setDefaultCropDimensions($item);
+    if ((!aMediaTools::isMultiple()) && aMediaTools::getAttribute('type') !== 'image')
+    {
+      return $this->redirect('aMedia/selected');
+    }
     return $this->renderComponent("aMedia", "multipleList");
   }
@@ -236 +305 @@
   public function executeMultipleRemove(sfRequest $request)
   {
-    $this->forward404Unless(aMediaTools::isMultiple());
     $id = $request->getParameter('id');
     $item = Doctrine::getTable("aMediaItem")->find($id);
@@ -250 +318 @@
   }
 
+  public function executeUpdateMultiplePreview(sfRequest $request)
+  {
+    return $this->renderComponent('aMedia', 'multiplePreview');
+  }
+  
   public function executeMultipleOrder(sfRequest $request)
   {
     $this->logMessage("*****MULTIPLE ORDER", "info");
     $order = $request->getParameter('a-media-selection-list-item');
-    $oldSelection = aMediaTools::getSelection();
+    $oldSelection = aMediaTools::getSelection();    
     $keys = array_flip($oldSelection);
     $selection = array();
@@ -269 +342 @@
       $this->logMessage(">>>KEEPING " . $item->getId(), "info");
     }
-    $this->logMessage(">>>SUCCEEDED: " . implode(", ", $selection), "info");
+    $this->logMessage(">>>SUCCEEDED: " . implode(", ", $selection), "info");    
     aMediaTools::setSelection($selection);
     return $this->renderComponent("aMedia", "multipleList");
   }
+  
   public function executeSelected(sfRequest $request)
   {
-    $controller = $this->getController();
     $this->forward404Unless(aMediaTools::isSelecting());
-    if (aMediaTools::isMultiple())
-    {
-      $selection = aMediaTools::getSelection();
-      // Ooops best to get this before clearing it huh
-      $after = aMediaTools::getAfter();
-      // Oops I forgot to call this in the multiple case
+    $selection = aMediaTools::getSelection();
+    $imageInfo = aMediaTools::getAttribute('imageInfo');
+    // Get all the items in preparation for possible cropping
+    if (count($selection))
+    {
+      $items = Doctrine::getTable('aMediaItem')->createQuery('m')->whereIn('m.id', $selection)->execute();
+    }
+    else
+    {
+      $items = array();
+    }
+    $items = aArray::listToHashById($items);
+    $newSelection = array();
+    foreach ($selection as $id)
+    {
+      if (isset($imageInfo[$id]['cropLeft']))
+      {
+        // We need to make a crop
+        $item = $items[$id];
+        $crop = $item->findOrCreateCrop($imageInfo[$id]);
+        $crop->save();
+        $newSelection[] = $crop->id;
+      }
+      else
+      {
+        $newSelection[] = $id;
+      }
+    }
+    // Ooops best to get this before clearing it huh
+    $after = aMediaTools::getAfter();
+    
+    // addParamsNoDelete never attempts to eliminate a field just because
+    // its value is empty. This is how we distinguish between cancellation
+    // and selecting zero items
+    
+    if (!aMediaTools::isMultiple())
+    {
+      // Call this too soon and you lose isMultiple
       aMediaTools::clearSelecting();
-      // I thought about submitting this like a multiple select,
-      // but there's no clean way to implement that feature in
-      // addParam, and it wastes URL space anyway
-      // (remember the 1024-byte limit)
-      
-      // addParamsNoDelete never attempts to eliminate a field just because
-      // its value is empty. This is how we distinguish between cancellation
-      // and selecting zero items
-      return $this->redirect(
-        aUrl::addParamsNoDelete($after,
-        array("aMediaIds" => implode(",", $selection))));
-    }
-    // Single select
-    $id = $request->getParameter('id');
-    $item = Doctrine::getTable("aMediaItem")->find($id);
-    $this->forward404Unless($item); 
-    $after = aMediaTools::getAfter();
-    $after = aUrl::addParams($after, 
-      array("aMediaId" => $id));
-    aMediaTools::clearSelecting();
-    return $this->redirect($after);
+      if (count($newSelection))
+      {
+        $after = aUrl::addParams($after, 
+          array("aMediaId" => $newSelection[0]));
+        return $this->redirect($after);
+      }
+      else
+      {
+        $this->forward404();
+      }
+    }
+    else
+    {
+      aMediaTools::clearSelecting();
+      $url = aUrl::addParamsNoDelete($after,
+      array("aMediaIds" => implode(",", $newSelection)));
+      return $this->redirect($url);
+    }
   }
 

plugins/apostrophePlugin/trunk/lib/action/BaseaMediaBackendActions.class.php

@@ -39 +39 @@
       array_keys(aMediaItemTable::$mimeTypes)));
     $this->forward404Unless(($resizeType !== 'c') || ($resizeType !== 's'));
-    $output = $this->getDirectory() . 
-      DIRECTORY_SEPARATOR . "$slug.$width.$height.$resizeType.$format";
+    // EDITED FOR ARBITRARY CROPPING
+    $cropLeft = $request->getParameter('cropLeft');
+    $cropTop = $request->getParameter('cropTop');
+    $cropWidth = $request->getParameter('cropWidth');
+    $cropHeight = $request->getParameter('cropHeight');
+    
+    if (!is_null($cropWidth) && !is_null($cropHeight) && !is_null($cropLeft) && !is_null($cropTop))
+    {
+      $cropLeft = ceil($cropLeft + 0);
+      $cropTop = ceil($cropTop + 0);
+      $cropWidth = ceil($cropWidth + 0);
+      $cropHeight = ceil($cropHeight + 0);
+      // Explicit cropping always preempts any automatic cropping, so there's no difference between c and s,
+      // and only the cropOriginal method actually supports cropping parameters, so
+      $resizeType = 'c';
+      
+      $output = $this->getDirectory() . 
+        DIRECTORY_SEPARATOR . "$slug.$cropLeft.$cropTop.$cropWidth.$cropHeight.$width.$height.$resizeType.$format";      
+    }
+    else
+    {
+      $cropLeft = null;
+      $cropTop = null;
+      $cropWidth = null;
+      $cropHeight = null;
+      $output = $this->getDirectory() . 
+        DIRECTORY_SEPARATOR . "$slug.$width.$height.$resizeType.$format";
+    }
+
     // If .htaccess has not been set up, or we are not running
     // from the default front controller, then we may get here
@@ -57 +84 @@
         $method = 'scaleToFit';
       }
-      $quality = sfConfig::get('app_aMedia_jpeg_quality', 75);
       aImageConverter::$method(
         aMediaItemTable::getDirectory() .
@@ -65 +91 @@
         $width,
         $height,
-        sfConfig::get('app_aMedia_jpeg_quality', 75));
+        sfConfig::get('app_aMedia_jpeg_quality', 75),
+        $cropLeft,
+        $cropTop,
+        $cropWidth,
+        $cropHeight);
     }
     // The FIRST time, we output this here. Later it

plugins/apostrophePlugin/trunk/lib/action/BaseaMediaComponents.class.php

@@ -110 +110 @@
   }
 
+  public function executeSelectMultiple($request)
+  {
+    $this->items = aMediaTools::getSelectedItems();
+  }
+
+  public function executeSelectSingle($request)
+  {
+    $this->items = aMediaTools::getSelectedItems();
+  }
+
   public function executeMultipleList($request)
   {
-    if (!aMediaTools::isMultiple())
-    {
-      throw new Exception("multiple list component, but multiple is off"); 
-    }
-    $selection = aMediaTools::getSelection();
-    if (!is_array($selection))
-    {
-      throw new Exception("selection is not an array");
-    }
-    // Work around the fact that whereIn doesn't evaluate to AND FALSE
-    // when the array is empty (it just does nothing; which is an
-    // interesting variation on MySQL giving you an ERROR when the 
-    // list is empty, sigh)
-    if (count($selection))
-    {
-      // Work around the unsorted results of whereIn. You can also
-      // do that with a FIELD function
-      $unsortedItems = Doctrine_Query::create()->
-        from('aMediaItem i')->
-        whereIn('i.id', $selection)->
-        execute();
-      $itemsById = array();
-      foreach ($unsortedItems as $item)
-      {
-        $itemsById[$item->getId()] = $item;
-      }
-      $this->items = array();
-      foreach ($selection as $id)
-      {
-        if (isset($itemsById[$id]))
-        {
-          $this->items[] = $itemsById[$id];
-        }
-      }
-    }
-    else
-    {
-      $this->items = array();
-    }
+    $this->items = aMediaTools::getSelectedItems();
+  }
+  
+  public function executeMultiplePreview()
+  {
+    $this->items = aMediaTools::getSelectedItems();
   }
 }

plugins/apostrophePlugin/trunk/lib/action/BaseaSlideshowSlotComponents.class.php

@@ -32 +32 @@
       }
       $this->itemIds = aArray::getIds($this->items);
-      foreach ($this->items as $item)
-      {
-        $this->itemIds[] = $item->id;
-      }
       if ($this->getOption('random', false))
       {

plugins/apostrophePlugin/trunk/lib/model/doctrine/PluginaMediaItem.class.php

@@ -20 +20 @@
     }
     // Let the culture be the user's culture
-    return aZendSearch::saveInDoctrineAndLucene($this, null, $conn);
+    $result = aZendSearch::saveInDoctrineAndLucene($this, null, $conn);
+    $crops = $this->getCrops();
+    foreach ($crops as $crop)
+    {
+      $crop->setTitle($this->getTitle());
+      $crop->setDescription($this->getDescription());
+      $crop->setCredit($this->getCredit());
+      $crop->save();
+    }
+    return $result;
   }
 
@@ -33 +42 @@
     $ret = aZendSearch::deleteFromDoctrineAndLucene($this, null, $conn);
     $this->clearImageCache();
+    
+    $this->deleteCrops();
+    
     // Don't even think about trashing the original until we know
     // it's gone from the db and so forth
@@ -132 +144 @@
     $path = $this->getOriginalPath($this->getFormat());
     $result = copy($file, $path);
+    // Crops are invalid if you replace the original image
+    $this->deleteCrops();
     return $result;
   }
@@ -249 +263 @@
     $options = aDimensions::constrain($this->getWidth(), $this->getHeight(), $this->getFormat(), $options);
 
-    return "aMediaBackend/image?" . http_build_query(
-      array("slug" => $this->slug, "width" => $options['width'], "height" => $options['height'], 
-        "resizeType" => $options['resizeType'], "format" => $options['format']));
+    $params = array("slug" => $this->slug, "width" => $options['width'], "height" => $options['height'], 
+      "resizeType" => $options['resizeType'], "format" => $options['format']);
+
+    // check for null because 0 is valid
+    if (!is_null($options['cropLeft']) && !is_null($options['cropTop']) && !is_null($options['cropWidth']) && !is_null($options['cropHeight']))
+    {      
+      $params = array_merge(
+        $params,
+        array("cropLeft" => $options['cropLeft'], "cropTop" => $options['cropTop'],
+          "cropWidth" => $options['cropWidth'], "cropHeight" => $options['cropHeight'])
+      );
+    }
+    return "aMediaBackend/image?" . http_build_query($params);
+  }
+  
+  public function getCropThumbnailUrl()
+  {    
+    $selectedConstraints = aMediaTools::getOption('selected_constraints');
+    
+    if ($aspectRatio = aMediaTools::getAspectRatio()) // this returns 0 if aspect-width and aspect-height were not set
+    {
+      $selectedConstraints = array_merge(
+        $selectedConstraints, 
+        array('height' => floor($selectedConstraints['width'] / $aspectRatio))
+      );
+    }
+    
+    
+    $imageInfo = aMediaTools::getAttribute('imageInfo');
+    if (isset($imageInfo[$this->id]['cropLeft']) &&
+        isset($imageInfo[$this->id]['cropTop']) && isset($imageInfo[$this->id]['cropWidth']) && isset($imageInfo[$this->id]['cropHeight']))
+    {
+      $selectedConstraints = array_merge(
+        $selectedConstraints, 
+        array(
+          'cropLeft' => $imageInfo[$this->id]['cropLeft'],
+          'cropTop' => $imageInfo[$this->id]['cropTop'],
+          'cropWidth' => $imageInfo[$this->id]['cropWidth'],
+          'cropHeight' => $imageInfo[$this->id]['cropHeight']
+        )
+      );
+    }
+      
+    return $this->getScaledUrl($selectedConstraints);
+  }
+  
+  // Crops of other images have periods in the slug. Real slugs are always [\w_]+ (well, the i18n equivalent)
+  public function isCrop()
+  {
+    return (strpos($this->slug, '.') !== false);
+  }
+  
+  public function getCrops()
+  {
+    // This should perform well because there is an index on the slug and
+    // indexes are great with prefix queries
+    return $this->getTable()->createQuery('m')->where('m.slug LIKE ?', array($this->slug . '.%'))->execute();
+    
+  }
+  
+  public function deleteCrops()
+  {
+    $crops = $this->getCrops();
+    // Let's make darn sure the PHP stuff gets called rather than using a delete all trick of some sort
+    foreach ($crops as $crop)
+    {
+      $crop->delete();
+    }
+  }
+  
+  public function findOrCreateCrop($info)
+  {
+    $slug = $this->slug . '.' . $info['cropLeft'] . '.' . $info['cropTop'] . '.' . $info['cropWidth'] . '.' . $info['cropHeight'];
+    $crop = $this->getTable()->findOneBySlug($slug);
+    if (!$crop)
+    {
+      $crop = $this->copy(false);
+      $crop->slug = $slug;
+      $crop->width = $info['cropWidth'];
+      $crop->height = $info['cropHeight'];
+    }
+    return $crop;
+  }
+  
+  public function getCroppingInfo()
+  {
+    $p = preg_split('/\./', $this->slug);
+    if (count($p) == 5)
+    {
+      return array('cropLeft' => $p[1], 'cropTop' => $p[2], 'cropWidth' => $p[3], 'cropHeight' => $p[4]);
+    }
+    else
+    {
+      return array();
+    }
+  }
+  
+  public function getCropOriginal()
+  {
+    if (!$this->isCrop())
+    {
+      return $this;
+    }
+    $p = preg_split('/\./', $this->slug);
+    return $this->getTable()->findOneBySlug($p[0]);
   }
 }

plugins/apostrophePlugin/trunk/lib/model/doctrine/PluginaMediaItemTable.class.php

@@ -164 +164 @@
       $query->andWhere('aMediaItem.height = ?', array($params['height'] + 0));
     }
+    // No crops in the browser please
+    $query->andWhere("aMediaItem.slug NOT LIKE '%.%'");
+    
     return $query;
   }

plugins/apostrophePlugin/trunk/lib/toolkit/aDimensions.class.php

@@ -24 +24 @@
     }
     $resizeType = $options['resizeType'];
+    $cropLeft = isset($options['cropLeft']) ? $options['cropLeft'] : null;
+    $cropTop = isset($options['cropTop']) ? $options['cropTop'] : null;
+    $cropWidth = isset($options['cropWidth']) ? $options['cropWidth'] : null;
+    $cropHeight = isset($options['cropHeight']) ? $options['cropHeight'] : null;
+    
+    if (isset($options['scaleWidth']) && isset($options['scaleHeight']) && !is_null($cropLeft) && !is_null($cropTop) && !is_null($cropWidth) && !is_null($cropHeight))
+    {
+      $scalingFactor =  $originalWidth / $options['scaleWidth'];
+            
+      $cropLeft = floor($scalingFactor * $cropLeft);
+      $cropTop = floor($scalingFactor * $cropTop);
+      $cropWidth = floor($scalingFactor * $cropWidth);
+      $cropHeight = floor($scalingFactor * $cropHeight);
+    }
+    
     if (!(isset($options['forceScale']) && $options['forceScale']))
     {
@@ -54 +69 @@
     }
     
-    return array("width" => $width, "height" => $height, "format" => $format, "resizeType" => $resizeType);
+    return array("width" => $width, "height" => $height, "format" => $format, "resizeType" => $resizeType,
+      "cropLeft" => $cropLeft, "cropTop" => $cropTop, "cropWidth" => $cropWidth, "cropHeight" => $cropHeight);
   }
 }

plugins/apostrophePlugin/trunk/lib/toolkit/aDoctrine.class.php

@@ -18 +18 @@
   // Example: 
   //
-  // $q = Doctrine::getTable('aMediaItem')->createQuery('m')->select('m.*'->whereIn('m.id', $ids);
+  // $q = Doctrine::getTable('aMediaItem')->createQuery('m')->select('m.*')->whereIn('m.id', $ids);
   // $mediaItems = aDoctrine::orderByList($q, $ids)->execute();
   

plugins/apostrophePlugin/trunk/lib/toolkit/aImageConverter.class.php

@@ -55 +55 @@
   }
 
-  static public function cropOriginal($fileIn, $fileOut, $width, $height, $quality = 75)
-  {
+  // $width and $height are the dimensions of the final rendered image. $quality is the JPEG quality setting (where needed).
+  // The $crop parameters, when not null (all four must be null or not null), are used to crop the original before scaling/distorting 
+  // to the specified width and height and are always in the original image's coordinates.
+  
+  // If cropping coordinates are not specified, the largest possible portion of the center of the original image is scaled to fit into the 
+  // destination image without distortion
+  
+  static public function cropOriginal($fileIn, $fileOut, $width, $height, $quality = 75, $cropLeft = null, $cropTop = null, $cropWidth = null,  $cropHeight = null)
+  {
+    // Allow skipping of parameters
+    if (is_null($quality))
+    {
+      $quality = 75;
+    }
     $width = ceil($width);
     $height = ceil($height);
@@ -67 +79 @@
     $iratio = $iwidth / $iheight;
     $ratio = $width / $height;
+
+     // Spike's contribution: arbitrary cropping
+     if (!is_null($cropWidth) && !is_null($cropHeight) && !is_null($cropLeft) && !is_null($cropTop))
+     {
+       $cropTop = ceil($cropTop + 0);
+       $cropLeft = ceil($cropLeft + 0);
+       $cropWidth = ceil($cropWidth + 0);
+       $cropHeight = ceil($cropHeight + 0);
+       
+       $scale = array('xysize' => array($width + 0, $height + 0));
+       $crop = array('left' => $cropLeft, 'top' => $cropTop, 'width' => $cropWidth, 'height' => $cropHeight);
+       return self::scaleBody($fileIn, $fileOut, $scale, $crop, $quality);
+     }
 
     $scale = array('xysize' => array($width + 0, $height + 0));
@@ -356 +381 @@
         $width = $scaleParameters['xysize'][0];
         $height = $scaleParameters['xysize'][1];
-        
+        // This was backwards until 05/31/2010, making things bigger rather than smaller if their
+        // aspect ratios differed from the original. Be consistent with netpbm which makes things
+        // smaller not bigger
         if (($width / $height) > ($swidth / $sheight))
         {
-          // Wider than the original. So it will be shorter than requested
-          $height = ceil($width * ($sheight / $swidth));
+          // Wider than the original. So it will be narrower than requested
+          $width = ceil($height * ($swidth / $sheight));
         }
         else
         {
-          // Taller than the original. So it will be narrower than requested
-          $width = ceil($height * ($swidth / $sheight));
+          // Taller than the original. So it will be shorter than requested
+          $height = ceil($width * ($sheight / $swidth));
         }
         $out = self::createTrueColorAlpha($width, $height);

plugins/apostrophePlugin/trunk/lib/toolkit/aImageConverterTest.php

@@ -1 +1 @@
 <?php
 
+class sfConfig
+{
+  static public function get($key, $default)
+  {
+    return $default;
+  }
+}
 require 'aImageConverter.class.php';
 
 // aImageConverter::scaleToFit("testin.jpg", "testoutscaletofit.jpg", 400, 300);
 // aImageConverter::scaleByFactor("testin.jpg", "testoutscalebyfactor.jpg", 0.5);
-aImageConverter::scaleToFit("testin.jpg", "testoutscaleoriginalbobbi.jpg", 340, 451);
+// aImageConverter::scaleToFit("testin.jpg", "testoutscaleoriginalbobbi.jpg", 340, 451);
 // aImageConverter::cropOriginal("testin.jpg", "testoutcroporiginaltall.jpg", 100, 300);
 // aImageConverter::scaleToNarrowerAxis("testin.jpg", "testoutscaletonarroweraxis.jpg", 300, 200);
+// aImageConverter::cropOriginal("testin.jpg", "testoutcroporiginaltall.jpg", 100, 300);
+aImageConverter::cropOriginal("testin.jpg", "testoutcroporiginalcorner.jpg", 100, 100, null, 200, 200, 200, 200);

plugins/apostrophePlugin/trunk/lib/toolkit/aMediaAPI.php

@@ -1 +1 @@
 <?php
 
-// Conveniences for Symfony code that uses the API.
+// DEPRECATED: based on the old REST API, which we do not enable by default and found
+// to be a serious maintenance hassle as our client projects simply don't call for
+// shared media repositories.
+
+// Conveniences for Symfony code that uses the REST API.
 
 class aMediaAPI

plugins/apostrophePlugin/trunk/lib/toolkit/aMediaRouting.php

@@ -26 +26 @@
         'action' => 'original'
       ), array('slug' => '^' . aTools::getSlugRegexpFragment() . '$', 'format' => '^(jpg|png|gif|pdf)$')));
-      
+
       $route = new sfRoute('/uploads/media_items/:slug.:width.:height.:resizeType.:format', array(
         'module' => 'aMediaBackend',
@@ -38 +38 @@
       ));
       $r->prependRoute('a_media_image', $route);
+
+      $route = new sfRoute('/uploads/media_items/:slug.:cropLeft.:cropTop.:cropWidth.:cropHeight.:width.:height.:resizeType.:format', array(
+        'module' => 'aMediaBackend',
+        'action' => 'image'
+      ), array(
+        'slug' => '^' . aTools::getSlugRegexpFragment() . '$',
+        'width' => '^\d+$',
+        'height' => '^\d+$',
+        'cropLeft' => '^\d+$',
+        'cropTop' => '^\d+$',
+        'cropWidth' => '^\d+$',
+        'cropHeight' => '^\d+$',
+        'resizeType' => '^\w$',
+        'format' => '^(jpg|png|gif)$'
+      ));
+      $r->prependRoute('a_media_image_cropped', $route);
       
       // What we want:

plugins/apostrophePlugin/trunk/lib/toolkit/aMediaTools.php

@@ -3 +3 @@
 class aMediaTools
 {
-  // These are used internally. If you want to select something
-  // with the media module please see the README, do not use these 
-  // methods directly
+  // These are used internally. See aMediaSelect for the methods you probably want
 
   static public function setSelecting($after, $multiple, $selection, 
     $options = array())
   {
+    $items = aMediaItemTable::retrieveByIds($selection);
+    $ids = array();
+    $imageInfo = array();
+    $selection = array();
+    foreach ($items as $item)
+    {
+      $croppingInfo = array();
+      if ($item->isCrop())
+      {
+        $croppingInfo = $item->getCroppingInfo();
+        $item = $item->getCropOriginal();
+      }
+      $id = $item->id;
+      $selection[] = $id;
+      $info = array('width' => $item->width, 'height' => $item->height);
+      $info = array_merge($info, $croppingInfo);
+      $imageInfo[$item->id] = $info;
+    }
+    
+    $cropping = isset($options['cropping']) && $options['cropping'];
+
     self::clearSelecting();
     self::setAttribute("selecting", true);
     self::setAttribute("after", $after);
     self::setAttribute("multiple", $multiple);
+    self::setAttribute("cropping", $cropping);
     self::setAttribute("selection", $selection);
+    self::setAttribute("imageInfo", $imageInfo);
     foreach ($options as $key => $val)
     {
@@ -140 +161 @@
     "selected_constraints" => array(
         "width" => 100,
-        "height" => 75,
-        "resizeType" => "c"),
+        "height" => false,
+        "resizeType" => "c",),
     "show_constraints" => array(
         "width" => 720,
         "height" => false,
+        "resizeType" => "s"),
+    "crop_constraints" => array(
+        "width" => 679,
+        "height" => 400,
         "resizeType" => "s"),
     'routes_register' => true,
@@ -188 +213 @@
     return $item;
   }
+  
+  // refactored this into this static method from executeMultipleList() because it is now needed
+  // for executeUpdateMultiplePreview() for cropping slideshow items
+  static public function getSelectedItems()
+  {
+    $selection = self::getSelection();
+    if (!is_array($selection))
+    {
+      throw new Exception("selection is not an array");
+    }
+    // Work around the fact that whereIn doesn't evaluate to AND FALSE
+    // when the array is empty (it just does nothing; which is an
+    // interesting variation on MySQL giving you an ERROR when the 
+    // list is empty, sigh)
+    if (count($selection))
+    {
+      // Work around the unsorted results of whereIn. You can also
+      // do that with a FIELD function
+      $unsortedItems = Doctrine_Query::create()->
+        from('aMediaItem i')->
+        whereIn('i.id', $selection)->
+        execute();
+      $itemsById = array();
+      foreach ($unsortedItems as $item)
+      {
+        $itemsById[$item->getId()] = $item;
+      }
+      $items = array();
+      foreach ($selection as $id)
+      {
+        if (isset($itemsById[$id]))
+        {
+          $items[] = $itemsById[$id];
+        }
+      }
+    }
+    else
+    {
+      $items = array();
+    }
+    
+    return $items;
+  }
+  
+  static public function getAspectRatio()
+  {
+    if (self::getAttribute('aspect-width') && self::getAttribute('aspect-width'))
+    {
+      return self::getAttribute('aspect-width') / self::getAttribute('aspect-height');
+    }
+    return 0;
+  }
+  
+  static public function getSelectedThumbnailHeight()
+  {
+    $selectedConstraints = self::getOption('selected_constraints');
+    if (false === $selectedConstraints['height'])
+    {
+      if ($aspectRatio = self::getAspectRatio())
+      {
+        return $selectedConstraints['width'] / $aspectRatio;
+      }
+      return 0; // Let's not divide by zero.
+    }
+    return $selectedConstraints['height'];
+  }
+  
+  /**
+   * This mirrors the default size math in aCrop.setAspectMask() in aCrop.js
+   */
+  static public function setDefaultCropDimensions($mediaItem)
+  {
+    $imageInfo = self::getAttribute('imageInfo');
+    $aspectRatio = self::getAspectRatio();
+    
+    if ($aspectRatio)
+    {    
+      if ($aspectRatio > 1)
+      {
+        $imageInfo[$mediaItem->id]['cropWidth'] = $mediaItem->getWidth();
+        $imageInfo[$mediaItem->id]['cropHeight'] = floor($mediaItem->getWidth() / $aspectRatio);
+      }
+      else
+      {
+        $imageInfo[$mediaItem->id]['cropHeight'] = $mediaItem->getHeight();
+        $imageInfo[$mediaItem->id]['cropWidth'] = floor($mediaItem->getHeight() * $aspectRatio);
+      }
+    }
+    else
+    {
+      $imageInfo[$mediaItem->id]['cropWidth'] = $mediaItem->getWidth();
+      $imageInfo[$mediaItem->id]['cropHeight'] = $mediaItem->getHeight();
+    }
+    
+    $imageInfo[$mediaItem->id]['cropLeft'] = 0;
+    $imageInfo[$mediaItem->id]['cropTop'] = floor(($mediaItem->getHeight() - $imageInfo[$mediaItem->id]['cropHeight']) / 2);
+        
+    self::setAttribute('imageInfo', $imageInfo);
+  }
 }

plugins/apostrophePlugin/trunk/modules/aImageSlot/templates/_normalView.php

@@ -16 +16 @@
   $slug = isset($slug) ? $sf_data->getRaw('slug') : null;
   $title = isset($title) ? $sf_data->getRaw('title') : null;
+  $embed = isset($embed) ? $sf_data->getRaw('embed') : null;
 ?>
 <?php use_helper('I18N') ?>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_browser.php

@@ -11 +11 @@
 ?>
 <?php use_helper('I18N') ?>
+<?php // Media is now an engine, so there's a page ?>
+<?php $page = aTools::getCurrentPage() ?>
   
 <?php // Entire media browser goes into what would otherwise be the regular apostrophe subnav ?>
 <?php slot('a-subnav') ?>
-
-<?php // Media is now an engine, so there's a page ?>
-<?php $page = aTools::getCurrentPage() ?>
 
 <?php // For backwards compatibility reasons it is best to implement these as before and after partials ?>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_describeConstraints.php

@@ -1 +1 @@
 <?php // Yes, this is template code, but we use regular PHP syntax because we are building a sentence and the introduction of ?>
-<?php // newlines wrecks the punctuation. ?>
-<?php 
-use_helper('I18N');
-$clauses = array();
-if (aMediaTools::getAttribute('aspect-width') && aMediaTools::getAttribute('aspect-height'))
-{
-  $clauses[] = __('A %w%x%h% aspect ratio', array('%w%' => aMediaTools::getAttribute('aspect-width'), '%h%' => aMediaTools::getAttribute('aspect-height')), 'apostrophe');
-}
-if (aMediaTools::getAttribute('minimum-width'))
-{
-  $clauses[] = __('A minimum width of %mw% pixels', array('%mw%' => aMediaTools::getAttribute('minimum-width')), 'apostrophe');
-}
-if (aMediaTools::getAttribute('minimum-height'))
-{
-  $clauses[] = __('A minimum height of %mh% pixels', array('%mh%' => aMediaTools::getAttribute('minimum-height')), 'apostrophe');
-}
-if (aMediaTools::getAttribute('width'))
-{
-  $clauses[] = __('A width of exactly %w% pixels', array('%w%' => aMediaTools::getAttribute('width')), 'apostrophe');
-}
-if (aMediaTools::getAttribute('height'))
-{
-  $clauses[] = __('A height of exactly %h% pixels', array('%h%' => aMediaTools::getAttribute('height')), 'apostrophe');
-}
-if (aMediaTools::getAttribute('type'))
-{
-  // Internationalize the plural so that can be correct too
-  $type = __(aMediaTools::getAttribute('type') . "s", null, 'apostrophe');
-} 
-else
-{
-  $type = __("items", null, 'apostrophe');
-}
-if (count($clauses))
-{
-  // Markup change: for I18N it's better to use a list here rather than
-  // trying to create a sentence with commas and 'and'
-  echo('<h3 class="a-constraints-description">' . __("Displaying only %t% with:", array('%t%' => $type), 'apostrophe') . '</h3>');
-  echo('<ul class="a-constraints">');
-  foreach ($clauses as $clause)
+<?php // newlines wrecks the punctuation. (OK, we're building a ul list now...) ?>
+<?php use_helper('I18N') ?>
+<?php // Images support cropping, which makes some of the constraints unnecessary to display ?>
+<?php // With other media types we must find an item that satisfies all of them. ?>
+<?php if (aMediaTools::getAttribute('type') === 'image'): ?>
+  <?php // We went with something simpler when cropping is present ?>
+        <?php if ($limitSizes): ?>
+        <h4 class="a-help"><?php echo __('Some images in your media library may not be large enough to be selected. Only images that can be used are displayed below.', null, 'apostrophe') ?></h4>
+        <?php endif ?>
+<?php else: ?>
+  <?php // No cropping, their only hope is to get proper details from us on what is allowed ?>
+  <?php
+  $clauses = array();
+  if (aMediaTools::getAttribute('aspect-width') && aMediaTools::getAttribute('aspect-height'))
   {
-    echo('<li>' . $clause . '</li>');
+    $clauses[] = __('A %w%x%h% aspect ratio', array('%w%' => aMediaTools::getAttribute('aspect-width'), '%h%' => aMediaTools::getAttribute('aspect-height')), 'apostrophe');
   }
-  echo('</ul>');
-}
+  if (aMediaTools::getAttribute('minimum-width'))
+  {
+    $clauses[] = __('A minimum width of %mw% pixels', array('%mw%' => aMediaTools::getAttribute('minimum-width')), 'apostrophe');
+  }
+  if (aMediaTools::getAttribute('minimum-height'))
+  {
+    $clauses[] = __('A minimum height of %mh% pixels', array('%mh%' => aMediaTools::getAttribute('minimum-height')), 'apostrophe');
+  }
+  if (aMediaTools::getAttribute('width'))
+  {
+    $clauses[] = __('A width of exactly %w% pixels', array('%w%' => aMediaTools::getAttribute('width')), 'apostrophe');
+  }
+  if (aMediaTools::getAttribute('height'))
+  {
+    $clauses[] = __('A height of exactly %h% pixels', array('%h%' => aMediaTools::getAttribute('height')), 'apostrophe');
+  }
+  if (aMediaTools::getAttribute('type'))
+  {
+    // Internationalize the plural so that can be correct too
+    $type = __(aMediaTools::getAttribute('type') . "s", null, 'apostrophe');
+  } 
+  else
+  {
+    $type = __("items", null, 'apostrophe');
+  }
+  if (count($clauses))
+  {
+    // Markup change: for I18N it's better to use a list here rather than
+    // trying to create a sentence with commas and 'and'
+    echo('<h4 class="a-constraints-description">' . __("Displaying only %t% with:", array('%t%' => $type), 'apostrophe') . '</h4>');
+    echo('<ul class="a-constraints">');
+    foreach ($clauses as $clause)
+    {
+      echo('<li>' . $clause . '</li>');
+    }
+    echo('</ul>');
+  }
+  ?>
+<?php endif ?>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_mediaItem.php

@@ -11 +11 @@
 <?php if (aMediaTools::isSelecting()): ?>
 
-  <?php if (aMediaTools::isMultiple()): ?>
+  <?php if (aMediaTools::isMultiple() || ($type === 'image')): ?>
     <?php $linkAttributes = 'href = "#" onClick="'. 
       jq_remote_function(array(
-                                "update" => "a-media-selection-list",
-                                'complete' => "aUI('a-media-selection-list');",  
+                        "update" => "a-media-selection-list",
+                        'complete' => "aUI('a-media-selection-list'); aMediaUpdatePreview();",  
         "url" => "aMedia/multipleAdd?id=$id")).'; return false;"' ?>
-  <?php else: ?>
-    <?php $linkAttributes = 'href = "' . url_for("aMedia/selected?id=$id") . '"' ?>
-  <?php endif ?>
+    <?php else: ?>
+      <?php // Non-image single select. The multiple add action is a bit of a misnomer here ?>
+      <?php // and redirects to aMedia/selected after adding the media item ?>
+      <?php $linkAttributes = 'href = "' . url_for("aMedia/multipleAdd?id=$id") . '"' ?>
+    <?php endif ?>
 
 <?php else: ?>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_multipleList.php

@@ -5 +5 @@
 <?php use_helper('I18N', 'jQuery') ?>
 
-<?php $ids = array() ?>
-
 <?php foreach ($items as $item): ?>
 <li id="a-media-selection-list-item-<?php echo $item->getId() ?>" class="a-media-selection-list-item">
         <?php $id = $item->getId() ?>
   <ul class="a-controls a-media-multiple-list-controls">        
+                <li>
+                        <a href="#crop" onclick="return false;" class="a-btn icon a-crop no-label" title="<?php echo __('Crop', null, 'apostrophe') ?>"><?php echo __('Crop', null, 'apostrophe') ?></a>
+                </li>
           <li><?php echo jq_link_to_remote(__("remove this item", null, 'apostrophe'),
     array(
       'url' => 'aMedia/multipleRemove?id='.$id,
       'update' => 'a-media-selection-list',
-                        'complete' => 'aUI("a-media-selection-list"); aMediaDeselectItem('.$id.')', 
+                        'complete' => 'aUI("a-media-selection-list"); aMediaDeselectItem('.$id.'); aMediaUpdatePreview()', 
     ), array(
                         'class'=> 'a-btn icon a-delete no-label',
@@ -22 +23 @@
         </ul>   
 
-        <div class="a-media-selected-item-drag-overlay" title="<?php echo __('Drag &amp; Drop to Order', null, 'apostrophe') ?>"></div>
+  <?php if (aMediaTools::isMultiple()): ?>
+        <div class="a-media-selected-item-drag-overlay" title="<?php echo __('Drag &amp; Drop to Order', null, 'apostrophe') ?>"></div>
+  <?php endif ?>
         <div class="a-media-selected-item-overlay"></div>
-  <img src="<?php echo url_for($item->getScaledUrl(aMediaTools::getOption('selected_constraints'))) ?>" />
-
-          <?php $ids[] = $item->getId() ?>
-
+  <img src="<?php echo url_for($item->getCropThumbnailUrl()) ?>" class="a-thumbnail" />
 </li>
 <?php endforeach ?>
@@ -33 +33 @@
 <script type="text/javascript" charset="utf-8">
 
-        function aMediaItemsIndicateSelected(ids)
+        function aMediaItemsIndicateSelected(cropOptions)
         {
-                $('.a-media-selected-overlay').remove();
+          var ids = cropOptions.ids;
+          aCrop.init(cropOptions);
+                $('.a-media-selected-overlay').remove();                
+                $('.a-media-selected').removeClass('a-media-selected');
                 
           var i;
@@ -47 +50 @@
                         }
                 }
-        
+                        
                 $('.a-media-item.a-media-selected').each(function(){
                         $(this).children('.a-media-item-thumbnail').prepend('<div class="a-media-selected-overlay"></div>');
                 });
+                
+                $('#a-media-selection-list-caption').hide();
+                if (!ids.length) {
+      $('#a-media-selection-list-caption').show();
+                }
 
                 $('.a-media-selected-overlay').fadeTo(0, 0.66);
+        }
+        
+        function aMediaUpdatePreview()
+        {
+          $('#a-media-selection-preview').load('<?php echo url_for('aMedia/updateMultiplePreview') ?>', function(){
+          // the preview images are by default set to display:none
+            $('#a-media-selection-preview li:first').addClass('current');
+            // set up cropping again; do hard reset to reinstantiate Jcrop
+            aCrop.resetCrop(true);
+          });
         }
 
@@ -66 +84 @@
 
         $(document).ready(function() { // On page ready indicate selected items
-                aMediaItemsIndicateSelected(<?php echo json_encode($ids) ?>) 
+          var cropOptions = {
+      ids: <?php echo json_encode(aMediaTools::getSelection()) ?>,
+      aspectRatio: <?php echo aMediaTools::getAspectRatio() ?>,
+      minimumSize: [<?php echo aMediaTools::getAttribute('minimum-width') ?>, <?php echo aMediaTools::getAttribute('minimum-height') ?>],
+      maximumSize: [<?php echo aMediaTools::getAttribute('maximum-width') ?>, <?php echo aMediaTools::getAttribute('maximum-height') ?>],
+      <?php // width height cropLeft cropTop cropWidth cropHeight hashed by image id ?>
+      imageInfo: <?php echo json_encode(aMediaTools::getAttribute('imageInfo')) ?>
+    };
+          
+                aMediaItemsIndicateSelected(cropOptions);
+                
                 $('.a-media-selected-item-overlay').fadeTo(0,.35); //cross-browser opacity for overlay
                 $('.a-media-selection-list-item').hover(function(){

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_multiplePreview.php

@@ +1 @@
+<?php // Make sure we're compatible with sf_escaping_strategy: true ?>
+<?php $items = $sf_data->getRaw('items') ?>
 <?php foreach ($items as $item): ?>
   <li id="a-media-selection-preview-<?php echo $item->getId() ?>" class="a-media-selection-preview-item">

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_selectMultiple.php

@@ -2 +2 @@
   // Compatible with sf_escaping_strategy: true
   $limitSizes = isset($limitSizes) ? $sf_data->getRaw('limitSizes') : null;
+  $items = $sf_data->getRaw('items') ? $sf_data->getRaw('items') : null;
 ?>
+<?php // Known as selectMultiple for historic reasons, but we use it for both single and multiple select now that ?>
+<?php // we have a need for cropping which requires a pause in both cases anyway. ?>
 <?php use_helper('I18N') ?>
+<?php use_javascript("/apostrophePlugin/js/plugins/jquery.jCrop.min.js") ?>
+<?php use_javascript("/apostrophePlugin/js/aCrop.js") ?>
+<?php use_stylesheet("/apostrophePlugin/css/Jcrop/jquery.Jcrop.css") ?>
 <div class="a-media-select">
 <?php $type = aMediaTools::getAttribute('type') ?>
@@ -9 +15 @@
 <?php $type = "media item" ?>
 <?php endif ?>
-        <p><?php echo __('Select one or more %typeplural% by clicking on them below. Drag and drop %typeplural%  to reorder them within the list of selected items. Remove %typeplural% by clicking on the trashcan.', array('%typeplural%' => __($type . 's')), 'apostrophe') ?>
-  <?php if ($limitSizes): ?>
-  <?php echo __('Only appropriately sized %typeplural% are shown.', array('%typeplural%' => __($type . 's')), 'apostrophe') ?>
-  <?php endif ?>
-  <?php echo __('When you\'re done, click "Save."', null, 'apostrophe') ?></p>
+        <h3><?php echo $label ?></h3>
 
-        <ul id="a-media-selection-list">
-        <?php include_component("aMedia", "multipleList") ?>
+        <div id="a-media-selection-list-caption">
+          <h4><?php echo __("Preview your selected image%plural% here.", array('%plural%' => aMediaTools::isMultiple() ? 's':' '), 'apostrophe') ?></h4>
+        </div>
+        <div id="a-media-selection-wrapper">
+                <ul id="a-media-selection-list" style="min-height:<?php echo ($thumbHeight = aMediaTools::getSelectedThumbnailHeight()) ? $thumbHeight + 10 : 85 ?>px;">
+                        <?php if($items): ?>
+                                <?php include_partial("aMedia/multipleList", array("items" => $items)) ?>
+                        <?php else: ?>
+                          <?php if (aMediaTools::isMultiple()): ?>
+                                <li class="a-media-selection-placeholder"><?php echo __('Add images to your slideshow', null, 'apostrophe') ?></li>
+                        <?php else: ?>
+                          <li class="a-media-selection-placeholder"><?php echo __('Select an image', null, 'apostrophe') ?></li>
+                        <?php endif ?>
+                        <?php endif ?>
+                </ul>
+
+                <?php echo jq_sortable_element("#a-media-selection-list", array("url" => "aMedia/multipleOrder")) ?>
+                <br class="c"/>
+
+                <div class="a-crop-workspace">
+                  <ul id="a-media-selection-preview">
+                        <?php include_partial("aMedia/multiplePreview", array("items" => $items)) ?>
+                  </ul>
+                  <ul class="a-controls a-media-crop-controls">
+                                <li><?php echo jq_link_to_function(__("Crop", null, 'apostrophe'), "aCrop.setCrop('".url_for('aMedia/crop')."')", array("class"=>"a-btn save")) ?></li>
+                          <li><?php echo jq_link_to_function(__("Cancel", null, 'apostrophe'), "aCrop.resetCrop()", array("class"=>"a-btn icon a-cancel event-default")) ?></li>
+                  </ul>
+                </div>
+        </div>
+        <ul class="a-controls a-media-slideshow-controls">
+                <li><?php echo link_to(aMediaTools::isMultiple() ? __("Save Slideshow", null, 'apostrophe') : __("Save Selection", null, 'apostrophe'), "aMedia/selected", array("class"=>"a-btn save big")) ?></li>
+          <li><?php echo link_to(__("Cancel", null, 'apostrophe'), "aMedia/selectCancel", array("class"=>"a-btn icon a-cancel big")) ?></li>
         </ul>
-
-        <?php echo jq_sortable_element("#a-media-selection-list", array("url" => "aMedia/multipleOrder")) ?>
-
-        <br class="c"/>
-
-        <ul class="a-controls a-media-slideshow-controls">
-                <li><?php echo link_to(__("Save", null, 'apostrophe'), "aMedia/selected", array("class"=>"a-btn save")) ?></li>
-          <li><?php echo link_to(__("Cancel", null, 'apostrophe'), "aMedia/selectCancel", array("class"=>"a-btn icon a-cancel")) ?></li>
-        </ul>
-        
 </div>
-        <br class="c"/>
+</div>
+<br class="c"/>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_selectSingle.php

@@ -17 +17 @@
   <?php endif ?>
   </p>
-        <?php 
-                //removing this cancel link for now, it exists above in the header
-                // echo link_to("cancel", "aMedia/selectCancel", array("class"=>"a-cancel")) 
-        ?>
+  <ul class="a-controls">
+    <li><?php echo link_to("cancel", "aMedia/selectCancel", array("class"=>"a-cancel")) ?></li>
+  </ul>
 </div>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/indexSuccess.php

@@ -7 +7 @@
   $results = isset($results) ? $sf_data->getRaw('results') : null;
 ?>
-<?php use_helper('I18N') ?>
+<?php use_helper('I18N','jQuery') ?>
 <?php slot('body_class') ?>a-media<?php end_slot() ?>
-
-<?php use_helper('jQuery') ?>
+<?php $type = aMediaTools::getAttribute('type') ?>
+<?php $selecting = aMediaTools::isSelecting() ?>
 
 <div id="a-media-plugin">
@@ -20 +20 @@
         <?php if (aMediaTools::isSelecting()): ?>
 
-    <?php if (isset($label)): ?>
-      <h3><?php echo htmlspecialchars($label) ?> or <?php echo link_to(__("Cancel", null, 'apostrophe'), "aMedia/selectCancel", array("class"=>"a-btn a-cancel text-only")) ?></h3>
+    <?php if (($type === 'image') || (aMediaTools::isMultiple())): ?>
+      <?php include_component('aMedia', 'selectMultiple', array('limitSizes' => $limitSizes, 'label' => (isset($label)?$label:null))) ?>
+    <?php else: ?>
+      <?php include_component('aMedia', 'selectSingle', array('limitSizes' => $limitSizes, 'label' => (isset($label)?$label:null))) ?>
     <?php endif ?>
-
-    <?php include_partial('aMedia/describeConstraints') ?>
-
-          <?php if (aMediaTools::isMultiple()): ?>
-            <?php include_partial('aMedia/selectMultiple', array('limitSizes' => $limitSizes)) ?>
-          <?php else: ?>
-            <?php include_partial('aMedia/selectSingle', array('limitSizes' => $limitSizes)) ?>
-          <?php endif ?>
-
         <?php endif ?>
 
-  <?php if (aMediaTools::userHasUploadPrivilege()): ?>
-
-   <ul class="a-controls a-media-controls">
-     <?php $selecting = aMediaTools::isSelecting() ?>
-     <?php $type = aMediaTools::getAttribute('type') ?>
-
-     <?php if (!($selecting && $type && ($type !== 'image'))): ?>
-     <li><a href="<?php echo url_for("aMedia/uploadImages") ?>" class="a-btn icon a-add"><?php echo __('Add Images', null, 'apostrophe') ?></a></li>
-     <?php endif ?>
-
-     <?php if (!($selecting && $type && ($type !== 'video'))): ?>
-     <li><a href="<?php echo url_for("aMedia/newVideo") ?>" class="a-btn icon a-add"><?php echo __('Add Video', null, 'apostrophe') ?></a></li>
-     <?php endif ?>
-
-     <?php if (!($selecting && $type && ($type !== 'pdf'))): ?>
-     <li><a href="<?php echo url_for("aMedia/editPdf") ?>" class="a-btn icon a-add"><?php echo __('Add PDF', null, 'apostrophe') ?></a></li>
-     <?php endif ?>
-
-   </ul>
-
-  <?php endif ?>
 </div>
 
@@ -60 +32 @@
 
 <div class="a-media-library">
+        
+        <h3>Media Library</h3>
+        
+        <?php include_partial('aMedia/describeConstraints', array('limitSizes' => $limitSizes)) ?>
+        
+        <?php if (aMediaTools::userHasUploadPrivilege()): ?>
+   <ul class="a-controls a-media-controls">
+
+     <?php if (!($selecting && $type && ($type !== 'image'))): ?>
+     <li><a href="<?php echo url_for("aMedia/uploadImages") ?>" class="a-btn icon big a-add"><?php echo __('Add Images', null, 'apostrophe') ?></a></li>
+     <?php endif ?>
+
+     <?php if (!($selecting && $type && ($type !== 'video'))): ?>
+     <li><a href="<?php echo url_for("aMedia/newVideo") ?>" class="a-btn icon big a-add"><?php echo __('Add Video', null, 'apostrophe') ?></a></li>
+     <?php endif ?>
+
+     <?php if (!($selecting && $type && ($type !== 'pdf'))): ?>
+     <li><a href="<?php echo url_for("aMedia/editPdf") ?>" class="a-btn icon big a-add"><?php echo __('Add PDF', null, 'apostrophe') ?></a></li>
+     <?php endif ?>
+   </ul>
+  <?php endif ?>
+        
  <?php for ($n = 0; ($n < count($results)); $n += 2): ?>
    <div class="a-media-row">

plugins/apostrophePlugin/trunk/modules/aSlideshowSlot/templates/_normalView.php

@@ -33 +33 @@
               "aMediaIds" => implode(",", $itemIds),
               "type" => "image",
-              "label" => __("Create a Slideshow", null, 'apostrophe'),
+              "label" => __("You are creating a slideshow of images.", null, 'apostrophe'),
               "after" => url_for("aSlideshowSlot/edit") . "?" . 
                 http_build_query(

plugins/apostrophePlugin/trunk/modules/aVideoSlot/templates/_normalView.php

@@ -14 +14 @@
   $slug = isset($slug) ? $sf_data->getRaw('slug') : null;
   $title = isset($title) ? $sf_data->getRaw('title') : null;
+  $embed = isset($embed) ? $sf_data->getRaw('embed') : null;
 ?>
 <?php use_helper('I18N') ?>

plugins/apostrophePlugin/trunk/web/css/a.css

@@ -721 +721 @@
 {
 padding: 0 !important;
+}
+
+.icon.a-crop
+{
+background-image: url(/apostrophePlugin/images/a-icon-crop.png);
 }
 
@@ -3725 +3730 @@
 width: 720px;
 float: right;
-margin-bottom: 20px;
+/*margin-bottom: 20px;*/
 /*overflow: hidden;*/
 }
@@ -3731 +3736 @@
 .a-media-toolbar
 {
-padding-bottom: 20px;
-border-bottom: 1px solid #ddd;
+padding-bottom: 15px;
+background:url("/apostropheBlogPlugin/images/a-blog-td-bg.png") repeat-x scroll 0 bottom transparent;
 }
 
@@ -3742 +3747 @@
 }
 
-.a-media-toolbar .a-media-controls,
 .a-media-toolbar .a-media-slideshow-controls
 {
 clear: both;
 }
+
+.a-media-library .a-controls.a-media-controls
+{
+        clear:both;
+        float:left;
+        display:inline;
+        margin:15px 0 30px 0!important;
+}
+
+.a-media-library .a-controls.a-media-controls li
+{
+        margin:0 !important;
+}
+
+
 
 .a-media-toolbar h3
@@ -3753 +3772 @@
         /*float: left;*/
         margin: 0 0 10px 0;
+        color:#333;
 }
 
@@ -3826 +3846 @@
 }
 
-.a-media-item.even
-{
-/*margin-right: 20px;*/
-}
-
 .a-media-item-title h3 a
 {
@@ -3846 +3861 @@
 {
 margin-bottom: 10px;
-float: left;
-display: inline;
 padding-bottom:10px;
+padding: 10px;
+margin: 0 0 20px -1px;
+background-color: #efefef;
+-moz-border-radius: 4px;
+-webkit-border-radius: 4px;
+border-radius: 4px;
+border: 1px solid #ccc;
+overflow: auto;
+}
+
+#a-media-selection-wrapper
+{
+        display: inline;
+        position: relative;
+        float: left;
+        width:680px;
+        padding:10px;
+        margin-bottom: 20px;
+        background-color: #222;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+        border-radius: 4px;
+        box-shadow:inset 0 0 10px #000000;
+  -moz-box-shadow:inset 0 0 10px #000000;
+  -webkit-box-shadow:inset 0 0 10px #000000;
 }
 
 #a-media-selection-list
 {
-float: left;
-margin: 10px 0;
+display: block;
+overflow: hidden;
+position: relative;
+width:690px;
+left:-10px;
+/*border: 1px dashed #999;*/
+-moz-border-radius: 4px;
+-webkit-border-radius: 4px;
+border-radius: 4px;
+/*background-color: #e6e6e6;*/
+}
+
+.a-media-selection-placeholder
+{
+        margin-left: 10px;
+        float: left;
+        width: 80px;
+        height: 50px;
+        border: 2px dashed #ddd;
+        padding: 10px;
+        color: #fff;
 }
 
@@ -3860 +3917 @@
 {
 float: left;
-margin: 0 16px 16px 0;
+margin: 5px 0px 5px 10px;
 cursor: move;
 position: relative;
+background: #fff url(/apostrophePlugin/images/a-icon-loader.gif) center center no-repeat;
+border: 2px solid #222;
+}
+
+.cropping-now
+{
+        border: 2px solid #ddd;
 }
 
@@ -3891 +3955 @@
 {
 float: left;
+}
+
+#a-media-selection-list-caption {
+  display: none;
+  position: absolute;
+  padding: 45px;
+  z-index: 1;
+}
+#a-media-selection-list-caption h4 {
+  font-size: 1.2em;
+  color: #999;
+}
+
+#a-media-selection-preview
+{
+        display:inline;
+        float:left;
+        width:100%;
+        margin:10px 0 0;
+}
+
+li.a-media-selection-preview-item {
+  display:none;
+        position:relative;
+        width:auto;
+        height:auto;
+}
+li.a-media-selection-preview-item.current {
+  display: block !important;
+}
+
+li.a-media-selection-preview-item .jcrop-holder {
+  margin-bottom:28px;
+}
+
+ul.a-media-crop-controls
+{
+        position: absolute;
+        display: none;
+        bottom: -29px;
+}
+
+.a-crop-workspace
+{
+        overflow: hidden;
+        display: none;
+/*margin: 0 0 10px;
+        padding: 10px;
+        background-color: #222;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+        border-radius: 4px;
+        box-shadow:inset 0 0 10px #000000;
+  -moz-box-shadow:inset 0 0 10px #000000;
+  -webkit-box-shadow:inset 0 0 10px #000000;*/
+}
+
+
+.a-crop-workspace h4
+{
+        color:#ddd;
+        margin-bottom:10px;
 }