Changeset 2134

Timestamp:

09/03/10 16:43:34 (21 months ago)

Author:

tboutell

Message:

* A single Upload Media button. You can upload any mix of allowed file extensions. Also a single Embed Media button although for now it just directs you to the usual workflow for adding video.
* The set of file extensions, mime types and overall media types ("images," "video," "office") understood by Apostrophe is now configurable (in principle) via app.yml. In practice the main benefit is that I'm cleaning up how our own code figures out what is supported by a particular media item, and making it easier to add project specific stuff. There's no magic way to make a slideshow slot suddenly handle embeds or render BMPs etc. but the hooks are coming
* Every item is previewed, either with an icon for its format or (for images) with an actual preview.
* There is always a "Replace File" browse field, which is separate from the preview as that has generated confusion and doesn't make much sense when we can't really preview a particular format. A file is a file is a file, so let's not special case too much
* You can now remove items during the annotation pass. Previously if you uploaded three good images and one bad file (like a BMP or a bad JPEG), you were stuck uploading some bogus fourth JPEG just to make the form validate. Now you have an alternative. This needs styling
* The uploaded filename is humanized into a reasonable suggested title (TODO: get JPEG metadata in preference to this)
* When you are browsing for images for a slot, you can only upload images. When you are filtering by images, you can only upload images.
* There is just one edit form for uploaded media, however it prevents you from changing the major type so you don't break typical uses (you can't replace a GIF with a DOC).
* Our file upload widget is much smarter about detecting mime types and preferred file extensions correctly for a wide variety of file types including Office files
* Previews can be templated anywhere in the template containing the form, they don't have to be automatically inserted by render() which was very limiting in terms of where you presented them
* Removed the "active" field in favor of paying attention to the names of the item fields. This simplifies the multiple upload/multiple edit code a lot
* Multiple upload just forwards to multiple edit, we don't need the cheesy JS redirect anymore

Location:

plugins/apostrophePlugin/trunk

Files:

• . (modified) (1 prop)
• README (modified) (1 diff)
• lib/action/BaseaMediaActions.class.php (modified) (12 diffs)
• lib/action/BaseaMediaBackendActions.class.php (modified) (4 diffs)
• lib/form/BaseaMediaEditForm.class.php (added)
• lib/form/BaseaMediaEditMultipleForm.class.php (added)
• lib/form/BaseaMediaImageForm.class.php (modified) (1 diff)
• lib/form/BaseaMediaUploadForm.class.php (added)
• lib/form/BaseaMediaUploadMultipleForm.class.php (added)
• lib/form/aMediaEditForm.class.php (added)
• lib/form/aMediaEditMultipleForm.class.php (added)
• lib/form/aMediaUploadForm.class.php (added)
• lib/form/aMediaUploadMultipleForm.class.php (added)
• lib/helper/aHelper.php (modified) (1 diff)
• lib/model/doctrine/PluginaMediaItem.class.php (modified) (3 diffs)
• lib/model/doctrine/PluginaMediaItemTable.class.php (modified) (2 diffs)
• lib/model/doctrine/PluginaPage.class.php.orig (added)
• lib/toolkit/BaseaTools.class.php (modified) (4 diffs)
• lib/toolkit/aImageConverter.class.php (modified) (4 diffs)
• lib/toolkit/aMediaRouting.php (modified) (1 diff)
• lib/toolkit/aMediaTools.php (modified) (6 diffs)
• lib/validator/aValidatedFile.class.php (added)
• lib/validator/aValidatorFilePersistent.class.php (modified) (7 diffs)
• lib/widget/aWidgetFormInputFilePersistent.class.php (modified) (3 diffs)
• modules/aMedia/templates/_browser.php (modified) (1 diff)
• modules/aMedia/templates/_edit.php (moved) (moved from plugins/apostrophePlugin/trunk/modules/aMedia/templates/_editImage.php) (3 diffs)
• modules/aMedia/templates/_editLinks.php (modified) (1 diff)
• modules/aMedia/templates/_mediaItem.php (modified) (3 diffs)
• modules/aMedia/templates/_upload.php (moved) (moved from plugins/apostrophePlugin/trunk/modules/aMedia/templates/_uploadImage.php)
• modules/aMedia/templates/editMultipleSuccess.php (moved) (moved from plugins/apostrophePlugin/trunk/modules/aMedia/templates/editImagesSuccess.php) (4 diffs)
• modules/aMedia/templates/editPdfSuccess.php (deleted)
• modules/aMedia/templates/editSuccess.php (moved) (moved from plugins/apostrophePlugin/trunk/modules/aMedia/templates/editImageSuccess.php) (1 diff)
• modules/aMedia/templates/indexSuccess.php (modified) (1 diff)
• modules/aMedia/templates/updateMultiplePreviewSuccess.php (deleted)
• modules/aMedia/templates/uploadImagesRedirect.php (deleted)
• modules/aMedia/templates/uploadImagesSuccess.php (deleted)
• modules/aMedia/templates/uploadSuccess.php (added)
• web/css/a.css (modified) (1 prop)
• web/images (modified) (1 prop)
• web/images/a-icons-format-pdf.png (added)
• web/js/a.js (modified) (1 diff)

plugins/apostrophePlugin/trunk/README

@@ -1 +1 @@
 # Apostrophe
 
-Welcome to the 1.0 stable release of Apostrophe! Although this is our first official stable release, our CMS is already in regular use on a number of production sites. This release reflects the fact that our code has been stable and ready for your professional use for quite some time.
+Welcome to Apostrophe! 
 
 For complete and extensive documentation of Apostrophe please visit

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

@@ -59 +59 @@
     $tag = $request->getParameter('tag');
     $type = $request->getParameter('type');
+    $typeInfos = aMediaTools::getTypeInfos($type);
+    $this->embedAllowed = false;
+    $this->uploadAllowed = false;
+    foreach ($typeInfos as $typeInfo)
+    {
+      if ($typeInfo['embeddable'])
+      {
+        $this->embedAllowed = true;
+      }
+      if (count($typeInfo['extensions']))
+      {
+        $this->uploadAllowed = true;
+      }
+    }
     $category = $request->getParameter('category');
     if (aMediaTools::getType())
@@ -409 +423 @@
   }
 
-  public function executeEditImage(sfRequest $request)
+  public function executeEdit(sfRequest $request)
   {
     $this->forward404Unless(aMediaTools::userHasUploadPrivilege());
@@ -424 +438 @@
     }
     $this->item = $item;
-    $this->form = new aMediaImageForm($item);
+    $this->form = new aMediaEditForm($item);
     if ($request->isMethod('post'))
     {
-      $this->firstPass = $request->getParameter('first_pass');
       $parameters = $request->getParameter('a_media_item');
       $files = $request->getFiles('a_media_item');
@@ -444 +457 @@
           // Everything except the actual copy which can't succeed
           // until the slug is cast in stone
-          $object->preSaveImage($file->getTempName());
+          $object->preSaveFile($file->getTempName());
         }
         $this->form->save();
         if ($file)
         {
-          $object->saveImage($file->getTempName());
+          $object->saveFile($file->getTempName());
         }
         return $this->redirect("aMedia/resumeWithPage");
       }
-    }
-  }
-
-  public function executeEditPdf(sfRequest $request)
-  {
-    $this->forward404Unless(aMediaTools::userHasUploadPrivilege());
-    $item = null;
-    $this->slug = false;
-    if ($request->hasParameter('slug'))
-    {
-      $item = $this->getItem();
-      $this->slug = $item->getSlug();
-    }
-    if ($item)
-    {
-      $this->forward404Unless($item->userHasPrivilege('edit'));
-    }
-    $this->item = $item;
-    $this->form = new aMediaPdfForm($item);
-    try
-    {
-      if ($request->isMethod('post'))
-      {
-        $this->firstPass = $request->getParameter('first_pass');
-        $parameters = $request->getParameter('a_media_item');
-        $files = $request->getFiles('a_media_item');
-        $this->form->bind($parameters, $files);
-        if ($this->form->isValid())
-        {
-          $file = $this->form->getValue('file');
-          $object = $this->form->getObject();
-          if ($file)
-          {
-            // This actually has to be shimmed in at a much lower level as an option if
-            // gs is not available. We can't just use a fake thumbnail as an 'original' as we
-            // do for foreign video because that would break 'download original'
-            // copy(sfConfig::get('sf_root_dir') . '/plugins/apostrophePlugin/web/images/a-media-pdf-btn-small.png', $previewFile);
-          
-            // Everything except the actual copy which can't succeed
-            // until the slug is cast in stone
-            if (!$object->preSaveImage($file->getTempName()))
-            {
-              // Ideally this doesn't happen, in practice sometimes a PDF has
-              // a good signature but bad content or ghostscript hates it
-              throw new sfException('Defective PDF file');
-            }
-          }
-          // The base implementation for saving files gets confused when 
-          // $file is not set, a situation that our code tolerates as useful 
-          // because if you're updating a record containing a PDF you 
-          // often don't need to submit a new one.
-          unset($this->form['file']);
-          $this->form->save();
-          if ($file)
-          {
-            $object->saveImage($file->getTempName());
-          }
-          return $this->redirect("aMedia/resumeWithPage");
-        }
-      }
-    } catch (Exception $e)
-    {
-      $this->serviceError = $e->getMessage();
-      // TODO make this visible somehow
     }
   }
@@ -577 +526 @@
           if ($thumbnail)
           {
-            $object->preSaveImage($thumbnail->getTempName());
+            $object->preSaveFile($thumbnail->getTempName());
           }
           $this->form->save();
           if ($thumbnail)
           {
-            $object->saveImage($thumbnail->getTempName());                     
+            $object->saveFile($thumbnail->getTempName());                     
           }
         }
@@ -644 +593 @@
           $object = $this->form->getObject();
           $new = !$object->getId();
-          $object->preSaveImage($thumbnailCopy);
+          $object->preSaveFile($thumbnailCopy);
           $object->setServiceUrl($url);
           $this->form->save();
-          $object->saveImage($thumbnailCopy);
+          $object->saveFile($thumbnailCopy);
           unlink($thumbnailCopy);
         }
@@ -655 +604 @@
   }
 
-  public function executeUploadImages(sfRequest $request)
+  public function executeUpload(sfRequest $request)
   {
     // Belongs at the beginning, not the end
     $this->forward404Unless(aMediaTools::userHasUploadPrivilege());
-    $this->form = new aMediaUploadImagesForm();
+    $this->form = new aMediaUploadMultipleForm();
     if ($request->isMethod('post'))
     {
@@ -668 +617 @@
       {
         $request->setParameter('first_pass', true);
-        $active = array();
         // Saving embedded forms is weird. We can get the form objects
         // via getEmbeddedForms(), but those objects were never really
@@ -676 +624 @@
         // See:
         // http://thatsquality.com/articles/can-the-symfony-forms-framework-be-domesticated-a-simple-todo-list
+        $items = $request->getParameter("a_media_items");
         for ($i = 0; ($i < aMediaTools::getOption('batch_max')); $i++)
         {
           $values = $this->form->getValues();
-          if ($values["item-$i"]['file'])
-          {
-            $active[] = $i;
+          $file = $values["item-$i"]['file'];
+          if ($file)
+          {
+            // Humanize the original filename
+            $title = $file->getOriginalName();
+            $title = preg_replace('/\.\w+$/', '', $title);
+            $title = aTools::slugify($title, false, false, ' ');
+            $items["item-$i"]['title'] = $title;
           }
           else
           {
             // So the editImagesForm validator won't complain about these
-            $items = $request->getParameter("a_media_items");
             unset($items["item-$i"]);
-            $request->setParameter("a_media_items", $items);
           }
         }
-        $request->setParameter('active', implode(",", $active));
-        // We'd like to just do this...
-        // $this->forward('aMedia', 'editImages');
-        // But we need to break out of the iframe, and 
-        // modern browsers ignore Window-target: _top which
-        // would otherwise be perfect for this.
-        // Fortunately, the persistent file upload widget can tolerate
-        // a GET-method redirect very nicely as long as we pass the
-        // persistids. So we make the current parameters available
-        // to a template that breaks out of the iframe via
-        // JavaScript and passes the prameters on.
-        $this->parameters = $request->getParameterHolder('a_media_items')->getAll();
-        // If I don't do this I just get redirected back to myself
-        unset($this->parameters['module']);
-        unset($this->parameters['action']);
-        return 'Redirect';
-      }
-    }
-  }
-
-  public function executeEditImages(sfRequest $request)
+        $request->setParameter("a_media_items", $items);
+        // We're not doing stupid iframe tricks anymore, so we can just forward
+        $this->forward('aMedia', 'editMultiple');
+        // 
+        // // We'd like to just do this...
+        // // $this->forward('aMedia', 'edit');
+        // // But we need to break out of the iframe, and 
+        // // modern browsers ignore Window-target: _top which
+        // // would otherwise be perfect for this.
+        // // Fortunately, the persistent file upload widget can tolerate
+        // // a GET-method redirect very nicely as long as we pass the
+        // // persistids. So we make the current parameters available
+        // // to a template that breaks out of the iframe via
+        // // JavaScript and passes the prameters on.
+        // $this->parameters = $request->getParameterHolder('a_media_items')->getAll();
+        // // If I don't do this I just get redirected back to myself
+        // unset($this->parameters['module']);
+        // unset($this->parameters['action']);
+        // return 'Redirect';
+      }
+    }
+  }
+
+  public function executeEditMultiple(sfRequest $request)
   {
     $this->forward404Unless(aMediaTools::userHasUploadPrivilege());
@@ -722 +677 @@
     // single HTML form element.
     $this->firstPass = $request->getParameter('first_pass');
-    $active = $request->getParameter('active');
-    $this->forward404Unless(preg_match("/^\d+[\d\,]*$/", $active));
-    $this->active = explode(",", $request->getParameter('active'));
-
-    $this->form = new aMediaEditImagesForm($this->active);
+    $items = $request->getParameter('a_media_items');
+    // The active parameter was redundant, just look at the items that are present.
+    // This allows successive passes to prune out some items if desired
+    $active = array();
+    foreach ($items as $itemName => $item)
+    {
+      if (preg_match('/^item-(\d+)$/', $itemName, $matches))
+      {
+        $active[] = $matches[1];
+      }
+    }
+
+    $this->form = new aMediaEditMultipleForm($active);
     $this->form->bind(
       $request->getParameter('a_media_items'),
       $request->getFiles('a_media_items'));
-    if ($this->form->isValid())
+    if ((!$this->firstPass) && $this->form->isValid())
     {
       $values = $this->form->getValues();
@@ -756 +719 @@
         // until the slug is cast in stone
         $file = $values[$key]['file'];
-        $object->preSaveImage($file->getTempName());
+        
+        $format = $file->getExtension();
+        if (strlen($format))
+        {
+          // Starts with a .
+          $format = substr($format, 1);
+        }
+        $object->format = $format;
+        $types = aMediaTools::getOption('types');
+        foreach ($types as $type => $info)
+        {
+          $extensions = $info['extensions'];
+          if (in_array($format, $extensions))
+          {
+            $object->type = $type;
+          }
+        }
+        $object->preSaveFile($file->getTempName());
         $object->save();
-        $object->saveImage($file->getTempName());
+        $object->saveFile($file->getTempName());
       }
       return $this->redirect('aMedia/resume');
@@ -764 +744 @@
   }
 
+  public function executeEmbed()
+  {
+    // TODO: rework this to be less video-oriented
+    return $this->redirect('aMedia/newVideo');
+  }
+  
   public function executeDelete()
   {

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

@@ -11 +11 @@
     $item = $this->getItem();
     $format = $request->getParameter('format');
-    $this->forward404Unless(
-      in_array($format, 
-      array_keys(aMediaItemTable::$mimeTypes)));
+    $mimeTypes = aMediaTools::getOption('mime_types');
+    $this->forward404Unless(isset($mimeTypes[$format]));
     $path = $item->getOriginalPath($format);
     if (!file_exists($path))
@@ -21 +20 @@
         $item->getOriginalPath($format));
     }
-    header("Content-type: " . aMediaItemTable::$mimeTypes[$format]);
+    header("Content-type: " . $mimeTypes[$format]);
     readfile($item->getOriginalPath($format));
     // Don't let the binary get decorated with crap
@@ -35 +34 @@
     $resizeType = $request->getParameter('resizeType');
     $format = $request->getParameter('format');
-    $this->forward404Unless(
-      in_array($format, 
-      array_keys(aMediaItemTable::$mimeTypes)));
+    $mimeTypes = aMediaTools::getOption('mime_types');
+    $this->forward404Unless(isset($mimeTypes[$format]));
     $this->forward404Unless(($resizeType !== 'c') || ($resizeType !== 's'));
     // EDITED FOR ARBITRARY CROPPING
@@ -105 +103 @@
     // PHP interpreter hit to consider, so use those directives!
     header("Content-length: " . filesize($output));
-    header("Content-type: " . aMediaItemTable::$mimeTypes[$format]);
+    header("Content-type: " . $mimeTypes[$format]);
     readfile($output);
       // If I don't bail out manually here I get PHP warnings,

plugins/apostrophePlugin/trunk/lib/form/BaseaMediaImageForm.class.php

@@ -23 +23 @@
     
     $this->setWidget('file', new aWidgetFormInputFilePersistent(array(
-      // Not yet
-      // "iframe" => true,
-      // "progress" => "Uploading...",
       'image-preview' => aMediaTools::getOption('gallery_constraints')
     )));

plugins/apostrophePlugin/trunk/lib/helper/aHelper.php

@@ -447 +447 @@
 {
   $args = array_slice(func_get_args(), 1);
-  
   a_js_call_array($callable, $args);
 }

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

@@ -108 +108 @@
   }
   
-  public function preSaveImage($file)
+  public function preSaveFile($file)
   {
     // Refactored into aImageConverter for easier reuse of this should-be-in-PHP functionality
@@ -123 +123 @@
         $this->height = $info['height'];
       }
-      $this->format = $info['format'];
+      // Don't force this, but it's useful when we're not
+      // coming from a normal upload form
+      if (!isset($file->format))
+      {
+        $this->format = $info['format'];
+      }
       $this->clearImageCache(true);
-      return true;
-    }
-    else
-    {
-      return false;
-    }
-  }
-
-  public function saveImage($file)
+    }
+  }
+
+  public function saveFile($file)
   {
     if (!$this->width)
     {
-      if (!$this->preSaveImage($file))
+      if (!$this->preSaveFile($file))
       {
         return false;
@@ -369 +369 @@
     return $this->getTable()->findOneBySlug($p[0]);
   }
+  
+  public function getDownloadable()
+  {
+    // Right now videos are always embedded and nothing else is
+    return ($this->type !== 'video');
+  }
+  
+  public function getEmbeddable()
+  {
+    // Right now videos are always embedded and nothing else is
+    return ($this->type === 'video');
+  }
 }

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

@@ -67 +67 @@
     return $q->execute();
   }
-  static public $mimeTypes = array(
-    "gif" => "image/gif",
-    "png" => "image/png",
-    "jpg" => "image/jpeg",
-    "pdf" => "application/pdf"
-  );
   
   // Returns a query matching media items satisfying the specified parameters, all of which
@@ -79 +73 @@
   // tag
   // search
-  // type (video or image)
+  // type (video, image, etc)
   // user (a username, to determine access rights)
   // aspect-width and aspect-height (returns only images with the specified aspect ratio)

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

@@ -688 +688 @@
   // trailing -'s are removed
   
-  static public function slugify($path, $allowSlashes = false)
+  // $betweenWords must not contain characters that have special meaning in a regexp.
+  // Usually it is - (the default) or ' '
+  
+  static public function slugify($path, $allowSlashes = false, $allowUnderscores = true, $betweenWords = '-')
   {
     // This is the inverse of the method above
@@ -694 +697 @@
     {
       // UTF-8 capable replacement for \W. Works fine for English and also for Greek, etc.
-      $alnum = '\p{L}\p{N}_';
+      $alnum = '\p{L}\p{N}' . ($allowUnderscores ? '_' : '');
       $modifier = 'u';
     }
     else
     {
-      $alnum = '\w';
+      $alnum = $allowUnderscores ? '\w' : '[A-Za-z0-9]';
       $modifier = '';
     }
@@ -706 +709 @@
       $alnum .= '\/';
     }
-    $regexp = "/[^$alnum\-]+/$modifier";
-    $path = aTools::strtolower(preg_replace("/[^$alnum\-]+/$modifier", '-', $path));  
+    // Removing - here expands flexibility and shouldn't hurt because it's the replacement anyway
+    $regexp = "/[^$alnum]+/$modifier";
+    $path = aTools::strtolower(preg_replace($regexp, $betweenWords, $path));  
     if ($allowSlashes)
     {
@@ -716 +720 @@
     }
     // No consecutive dashes
-    $path = preg_replace("/-+/$modifier", '-', $path);
+    $path = preg_replace("/$betweenWords+/$modifier", $betweenWords, $path);
     // Leading and trailing dashes are silly. This has the effect of trim()
     // among other sensible things

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

@@ -258 +258 @@
   static private function scaleGd($fileIn, $fileOut, $scaleParameters = array(), $cropParameters = array(), $quality = 75)
   {
+    
     // gd version for those who can't install netpbm, poor buggers
     // "handles" PDF by rendering a blank white image. We already superimpose a PDF icon,
@@ -295 +296 @@
     {
       $in = self::imagecreatefromany($fileIn);
+    }
+    
+    if (!$in)
+    {
+      return false;
     }
     
@@ -453 +459 @@
   // If the file does not have a valid header identifying it as one of these types, false is returned.
   
-  static public function getInfo($file)
-  {
+  // If the 'format-only' option is true, only the format field is returned. This is much faster if the
+  // file is a PDF.
+  
+  static public function getInfo($file, $options = array())
+  {
+    $formatOnly = (isset($options['format-only']) && $options['format-only']);
     $result = array();
     $in = fopen($file, "rb");
     $data = fread($in, 4);
     fclose($in);
+    
+    
     if ($data === '%PDF')
     {
-      if (!aImageConverter::supportsInput('pdf'))
+      // format-only 
+      if ((!aImageConverter::supportsInput('pdf')) || $formatOnly)
       {
         // All we can do is confirm the format and allow
@@ -528 +541 @@
       }
       $format = $formats[$data[2]];
+      $result['format'] = $format;
+      if ($formatOnly)
+      {
+        return $result;
+      }
       $result['width'] = $data[0];
       $result['height'] = $data[1];
-      $result['format'] = $format;
       return $result;
     }

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

@@ -102 +102 @@
       )));
       
-      $r->prependRoute('a_media_upload_images', new aRoute('/uploadImages', array(
+      $r->prependRoute('a_media_upload', new aRoute('/upload', array(
         'module' => 'aMedia',
-        'action' => 'uploadImages'
+        'action' => 'upload'
       )));
       
-      $r->prependRoute('a_media_edit_images', new aRoute('/editImages', array(
+      $r->prependRoute('a_media_edit_multiple', new aRoute('/editMultiple', array(
         'module' => 'aMedia',
-        'action' => 'editImages'
+        'action' => 'editMultiple'
+      )));
+
+      $r->prependRoute('a_media_edit', new aRoute('/edit', array(
+        'module' => 'aMedia',
+        'action' => 'edit'
       )));
       

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

@@ -106 +106 @@
     return self::getAttribute('type');
   }
+  
+  static public function getBestTypeLabel()
+  {
+    $type = aMediaTools::getType();
+    if ($type)
+    {
+      $typeInfo = aMediaTools::getTypeInfo($type);
+      return $typeInfo['label'];
+    }
+    else
+    {
+      return 'Media';
+    }
+  }
 
   static public function userHasUploadPrivilege()
@@ -129 +143 @@
     return sfContext::getInstance()->getUser();
   }
-  // Symfony 1.2 has no namespaces for attributes for some reason
+
   static public function getAttribute($attribute, $default = null)
   {
+    // If you are logged out, you should have no attributes, as
+    // all attributes used in the media engine relate to selection
+    if (!self::getUser()->isAuthenticated())
+    {
+      return $default;
+    }
     $attribute = "aMedia-$attribute";
     return self::getUser()->getAttribute($attribute, $default, 'apostrophe_media');
   }
+  
   static public function setAttribute($attribute, $value = null)
   {
@@ -140 +161 @@
     self::getUser()->setAttribute($attribute, $value, 'apostrophe_media');
   }
+  
   static public function removeAttributes()
   {
@@ -145 +167 @@
     $user->getAttributeHolder()->removeNamespace('apostrophe_media');
   }
+  
   // This is a good convention for plugin options IMHO
   static private $options = array(
@@ -174 +197 @@
     'apipublic' => false,
     'embed_codes' => false,
-    'apikeys' => array()
-  );
+    'apikeys' => array(),
+
+    // All mime types that are acceptable for upload to the media repository,
+    // keyed by the file extensions we save them under (regardless of the original name)
+    
+    'mime_types' => array(
+      "gif" => "image/gif",
+      "png" => "image/png",
+      "jpg" => "image/jpeg",
+      "pdf" => "application/pdf",
+      "mp3" => "mpeg/mp3",
+      'xls' => 'application/vnd.ms-excel',
+      'ppt' => 'application/vnd.ms-powerpoint',
+      'doc' => 'application/msword',
+      'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+      'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+      'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+      'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+      'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+      'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+      'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+      'txt' => 'text/plain',
+      'rtf' => 'text/rtf'
+      ),
+      
+    // You can override these to add more types to the system. These are the 
+    // major types one can filter by in the media repository. Adding something here
+    // doesn't necessarily mean browsers can display it or our slots are designed
+    // to render it, in particular don't add new audio formats to 'audio' without
+    // overriding our audio slots to play them (and keep in mind the browser probably
+    // knows nothing about them)
+    
+    // Video has no extensions because we don't provide processing of video uploads,
+    // which are in a dizzying array of formats most browsers won't play. That's why
+    // YouTube exists. Videos are brought into the system via "Embed Media," not "Upload Media"
+
+    // Typically the only section you'll override here is 'file'. You can add more
+    // accepted extensions and/or break it up into 'Office' and 'Other' etc
+
+    // Also see 'getDownloadable' and 'getEmbeddable' in aMediaItem
+
+    'types' => array(
+      'image' => array('label' => 'Image', 'extensions' => array('gif', 'png', 'jpg'), 'embeddable' => false),
+      'pdf' => array('label' => 'PDF', 'extensions' => array('pdf'), 'embeddable' => false),
+      'audio' => array('label' => 'Audio', 'extensions' => array('mp3'), 'embeddable' => false),
+      'video' => array('label' => 'Video', 'extensions' => array(), 'embeddable' => true),
+      
+      // A long whitelist of file formats that are usually benign and useful.
+      // No .exe, no .zip. You can add them via app.yml if you really want them.
+      // We list only the non-macro-enabled Microsoft extensions in an effort to
+      // honor their good-faith attempt to label more dangerous files
+      
+      'office' => array('label' => 'Office', 'extensions' => array('txt', 'rtf', 'csv', 'doc', 'docx', 'xls', 'xlsx', 'xlsb', 'ppt', 'pptx', 'ppsx'), 'embeddable' => false)));
+  
   static public function getOption($name)
   {
@@ -188 +264 @@
       throw new Exception("Unknown option in apostrophePlugin: $name");
     }
+  }
+  
+  static public function getTypeInfo($name)
+  {
+    $types = aMediaTools::getOption('types');
+    return $types[$name];
+  }
+
+  // Returns an array of type infos, just the one if you specify a type, all if you don't.
+  // Handy when filtering
+  static public function getTypeInfos($type = null)
+  {
+    $types = aMediaTools::getOption('types');
+    if (is_null($type))
+    {
+      return $types;
+    }
+    return array($types[$type]);
   }
   

plugins/apostrophePlugin/trunk/lib/validator/aValidatorFilePersistent.class.php

@@ -17 +17 @@
 class aValidatorFilePersistent extends sfValidatorFile
 {
+  // Make the original name available to guessers. It's a nice thought to
+  // avoid this but with Microsoft Office formats there are no reliable
+  // magic numbers, and those that do exist can be misleading because
+  // Word can contain Excel and vice versa
+  protected $originalName;
   
   protected function configure($options = array(), $messages = array())
@@ -31 +36 @@
       array_unshift($mimeTypeGuessers, array($this, 'guessFromImageconverter'));
       array_unshift($mimeTypeGuessers, array($this, 'guessFromID3'));
+      array_unshift($mimeTypeGuessers, array($this, 'guessRTF'));
       $this->setOption('mime_type_guessers', $mimeTypeGuessers);
     }
@@ -123 +129 @@
       $cvalue = $value['newfile'];
     }
-    // This will throw an exception if there is a validation error.
-    // That's a good thing: we don't want to save it for reuse
-    // in that situation.
+    $this->originalName = $cvalue['name'];
     try
     {
@@ -155 +159 @@
         $data['newfile'] = true;
         $data['tmp_name'] = $filePath;
+        
+        // It's useful to know the mime type and true extension for 
+        // supplying previews and icons
+        $extensionsByMimeType = array_flip(aMediaTools::getOption('mime_types'));
+        $data['mime_type'] = $this->getMimeType($filePath, $cvalue['type']);
+        if (isset($extensionsByMimeType[$data['mime_type']]))
+        {
+          $data['extension'] = $extensionsByMimeType[$data['mime_type']];
+        }
+        
         self::putFileInfo($persistid, $data);
       }
@@ -197 +211 @@
       $persistid = $value['persistid'];
       $info = self::getFileInfo($persistid);
+      // Only web images are reasonable for preview. We could do
+      // PDFs but in practice it's very slow, slower than you
+      // want to wait for when annotating; it's worth it later
+      // for display in the media repository
+      return $info['tmp_name'] && getimagesize($info['tmp_name']);
+    }
+    return false;
+  }
+
+  static public function alreadyPersisting($value)
+  {
+    if (isset($value['persistid']))
+    {
+      $persistid = $value['persistid'];
+      $info = self::getFileInfo($persistid);
+      // Only web images are reasonable for preview. We could do
+      // PDFs but in practice it's very slow, slower than you
+      // want to wait for when annotating; it's worth it later
+      // for display in the media repository
       return !!$info['tmp_name'];
     }
     return false;
   }
+
   
   static public function getFileInfo($persistid)
@@ -217 +251 @@
     else
     {
-      return false;
+      return false; 
     }
   }
@@ -273 +307 @@
     return 'audio/mpeg';
   }
+
+  protected function guessRTF($file)
+  {
+    $in = fopen($file, 'rb');
+    $magic = fread($in, 5);
+    fclose($in);
+    if ($magic !== '{\\rtf')
+    {
+      return null;
+    }
+    return 'text/rtf';
+  }
+  
+  protected function guessMicrosoft($file)
+  {
+    // We look at the original name to get the rest.
+    // Sorry, but there are no reliable magic numbers
+    // that don't sometimes mislead for Microsoft Office files.
+    $in = fopen($file, "rb");
+    $data = fread($in, 3);
+    fclose($in);
+    $maybeMicrosoft = false;
+    // Magic numbers: old Microsoft container and new zip-based Microsoft container
+    if (($data === sprintf("%c%c%c", 0xD0, 0xCF, 0x11)) || ($data === sprintf("%c%c%c", 0x50, 0x4B, 0x03)))
+    {
+      $maybeMicrosoft = true;
+    }
+    if (!$maybeMicrosoft)
+    {
+      return null;
+    }
+    $ms = array(
+      'xls' => 'application/vnd.ms-excel',
+      'ppt' => 'application/vnd.ms-powerpoint',
+      'doc' => 'application/msword',
+      'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+      'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+      'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+      'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+      'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+      'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+      'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template'
+    );
+    if (preg_match('/\.(\w+)$/', $this->originalName, $matches))
+    {
+      $extension = $matches[1];
+      if (isset($ms[$extension]))
+      {
+        return $ms[$extension];
+      }
+    }
+    return null;
+  }
+  
+  protected function getMimeType($file, $fallback)
+  {
+    // The microsoft guesser needs access to the original filename.
+    // For reasons I'm not sure of, it doesn't work as a dynamic method
+    // with call_user_func.
+    $match = $this->guessMicrosoft($file);
+    if (!is_null($match))
+    {
+      return $match;
+    }
+
+    return parent::getMimeType($file, $fallback);
+  }
 }

plugins/apostrophePlugin/trunk/lib/widget/aWidgetFormInputFilePersistent.class.php

@@ -14 +14 @@
 class aWidgetFormInputFilePersistent extends sfWidgetForm
 {
+  
   /**
    * @param array $options     An array of options
@@ -51 +52 @@
   public function render($name, $value = null, $attributes = array(), $errors = array())
   {
-    $exists = false;
-    if (isset($value['persistid']) && strlen($value['persistid']))
-    {
-      $persistid = $value['persistid'];
-      $info = aValidatorFilePersistent::getFileInfo($persistid);
-      if ($info)
-      {
-        $exists = true;
-      }
-    }
-    else
-    {
-      // One implementation, not two (to inevitably drift apart)
-      $persistid = aGuid::generate();
-    }
+    list($exists, $persistid, $extension) = $this->getExistsPersistidAndExtension($value);
     $result = '';
-    // hasOption just verifies that the option is valid, it doesn't check what,
-    // if anything, was passed. Thanks to Lucjan Wilczewski 
     $preview = $this->hasOption('image-preview') ? $this->getOption('image-preview') : false;
-    $defaultPreview = $this->hasOption('default-preview') ? $this->getOption('default-preview') : false;
+    
     if ($exists)
     {
-      $defaultPreview = false;
-    }
-    if ($exists || $defaultPreview)
-    {
-      if ($preview)
-      {
-        // Note change of key
-        $urlStem = sfConfig::get('app_aPersistentFileUpload_preview_url', '/uploads/uploaded_image_preview');
-        // This is the corresponding directory path. You have to override one
-        // if you override the other. You override this one by setting
-        // app_aToolkit_upload_uploaded_image_preview_dir
-        $dir = aFiles::getUploadFolder("uploaded_image_preview");
-        // While we're here age off stale previews
-        aValidatorFilePersistent::removeOldFiles($dir);
-        $imagePreview = $this->getOption('image-preview');
-        if ($exists)
-        {
-          $source = $info['tmp_name'];
-        }
-        else
-        {
-          $source = $defaultPreview;
-        }
-        $info = aImageConverter::getInfo($source);
-        if ($info)
-        {
-          $iwidth = $info['width'];
-          $height = $info['height'];
-          // This is safe - based on sniffed file contents and not a user supplied extension
-          $format = $info['format'];
-          list($iwidth, $iheight) = getimagesize($source);
-          $dimensions = aDimensions::constrain($iwidth, $iheight, $format, $imagePreview);
-          // A simple filename reveals less
-          $imagename = "$persistid.$format";
-          $url = "$urlStem/$imagename";
-          $output = "$dir/$imagename";
-          if ((isset($info['newfile']) && $info['newfile']) || (!file_exists($output)))
-          {
-            if ($imagePreview['resizeType'] === 'c')
-            {
-              $method = 'cropOriginal';
-            }
-            else
-            {
-              $method = 'scaleToFit';
-            }
-            sfContext::getInstance()->getLogger()->info("YY calling converter method $method width " . $dimensions['width'] . ' height ' . $dimensions['height']);
-            aImageConverter::$method(
-              $source,
-              $output,
-              $dimensions['width'],
-              $dimensions['height']);
-            sfContext::getInstance()->getLogger()->info("YY after converter");
-          }
-        }
-        if (isset($imagePreview['markup']))
-        {
-          $markup = $imagePreview['markup'];
-        }
-        else
-        {
-          $markup = '<img src="%s" />';
-        }
-        $result .= sprintf($markup, $url);
-      }
       $result .= $this->getOption('existing-html');
     }
+    
+    if ($preview)
+    {
+      if (isset($imagePreview['markup']))
+      {
+        $markup = $imagePreview['markup'];
+      }
+      else
+      {
+        $markup = '<img src="%s" />';
+      }
+      $previewUrl = $this->getPreviewUrl($value, $preview);
+      if ($previewUrl !== false)
+      {
+        $result .= sprintf($markup, $previewUrl);
+      }
+    }
+
     return $result .
       $this->renderTag('input',
@@ -153 +91 @@
           'value' => $persistid));
   }
-
+  
+  public function getPreviewUrl($value, $imagePreview = array())
+  {
+    list($exists, $persistid, $extension) = $this->getExistsPersistidAndExtension($value);
+    
+    // hasOption just verifies that the option is valid, it doesn't check what,
+    // if anything, was passed. Thanks to Lucjan Wilczewski 
+    $defaultPreview = $this->hasOption('default-preview') ? $this->getOption('default-preview') : false;
+    if ($exists)
+    {
+      $defaultPreview = false;
+    }
+    if ($exists || $defaultPreview)
+    {
+      // Note change of key
+      $urlStem = sfConfig::get('app_aPersistentFileUpload_preview_url', '/uploads/uploaded_image_preview');
+      // This is the corresponding directory path. You have to override one
+      // if you override the other. You override this one by setting
+      // app_aToolkit_upload_uploaded_image_preview_dir
+      $dir = aFiles::getUploadFolder("uploaded_image_preview");
+      // While we're here age off stale previews
+      aValidatorFilePersistent::removeOldFiles($dir);
+      if ($exists)
+      {
+        $info = aValidatorFilePersistent::getFileInfo($persistid);
+        $source = $info['tmp_name'];
+      }
+      else
+      {
+        $source = $defaultPreview;
+      }
+      $info = aImageConverter::getInfo($source, array('format-only' => true));
+      $previewable = false;
+      if ($info && in_array($info['format'], array('jpg', 'png', 'gif')))
+      {
+        $previewable = true;
+        $info = aImageConverter::getInfo($source);
+      }
+      if ($previewable)
+      {
+        $iwidth = $info['width'];
+        $iheight = $info['height'];
+        // This is safe - based on sniffed file contents and not a user supplied extension
+        $format = $info['format'];
+        $dimensions = aDimensions::constrain($iwidth, $iheight, $format, $imagePreview);
+        // A simple filename reveals less
+        $imagename = "$persistid.$format";
+        $url = "$urlStem/$imagename";
+        $output = "$dir/$imagename";
+        if ((isset($info['newfile']) && $info['newfile']) || (!file_exists($output)))
+        {
+          if ($imagePreview['resizeType'] === 'c')
+          {
+            $method = 'cropOriginal';
+          }
+          else
+          {
+            $method = 'scaleToFit';
+          }
+          sfContext::getInstance()->getLogger()->info("YY calling converter method $method width " . $dimensions['width'] . ' height ' . $dimensions['height']);
+          aImageConverter::$method(
+            $source,
+            $output,
+            $dimensions['width'],
+            $dimensions['height']);
+          sfContext::getInstance()->getLogger()->info("YY after converter");
+        }
+      }
+      else
+      {
+        if ($extension !== false)
+        {
+          $url = '/apostrophePlugin/images/a-icons-format-' . $extension . '.png';
+        }
+      }
+      return $url;
+    }
+    return false;
+  }
+  
+  protected function getExistsPersistidAndExtension($value)
+  {
+    // TODO: should cache this
+    $exists = false;
+    $extension = false;
+    if (isset($value['persistid']) && strlen($value['persistid']))
+    {
+      $persistid = $value['persistid'];
+      $info = aValidatorFilePersistent::getFileInfo($persistid);
+      if ($info)
+      {
+        $exists = true;
+        if (isset($info['extension']))
+        {
+          $extension = $info['extension'];
+        }
+      }
+    }
+    else
+    {
+      // One implementation, not two (to inevitably drift apart)
+      $persistid = aGuid::generate();
+    }
+    
+    if (!$exists)
+    {
+      $defaultPreview = $this->hasOption('default-preview') ? $this->getOption('default-preview') : false;
+      if ($defaultPreview)
+      {
+        $extension = pathinfo($defaultPreview, PATHINFO_EXTENSION);
+      }
+    }
+    
+    return array($exists, $persistid, $extension);
+  }
 }

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

@@ -44 +44 @@
                   <div class="a-filter-options type">
                                 <?php $type = isset($type) ? $type : '' ?>
-                                <div class="a-filter-option">
-                                        <?php echo link_to(__('Image', null, 'apostrophe'), aUrl::addParams($current, array('type' => ($type == 'image') ? '' : 'image')), array('class' => ($type=='image') ? 'selected' : '', )) ?>
-                                </div>
-                                <div class="a-filter-option">
-                                        <?php echo link_to(__('Video', null, 'apostrophe'), aUrl::addParams($current, array('type' => ($type == 'video') ? '' : 'video')), array('class' => ($type=='video') ? 'selected' : '', )) ?>                           
-                                </div>
-                                <div class="a-filter-option">
-                                        <?php echo link_to(__('PDF', null, 'apostrophe'), aUrl::addParams($current, array('type' => ($type == 'pdf') ? '' : 'pdf')), array('class' => ($type=='pdf') ? 'selected' : '', )) ?>
-                                </div>
+                    <?php $typesInfo = aMediaTools::getOption('types') ?>
+                                <?php foreach ($typesInfo as $typeName => $typeInfo): ?>
+                                <div class="a-filter-option">
+                                        <?php echo link_to(a_($typeInfo['label']), aUrl::addParams($current, array('type' => ($typeName == $type) ? '' : $typeName)), array('class' => ($typeName == $type) ? 'selected' : '', )) ?>
+                                </div>
+                        <?php endforeach ?>
                   </div>
                 </div>

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

@@ -8 +8 @@
   $n = isset($n) ? $sf_data->getRaw('n') : null;
 ?>
-<?php use_helper('I18N') ?>
+<?php use_helper('a') ?>
   
 <?php if (!isset($n)): ?> <?php $n = 0 ?> <?php endif ?>
 
+<?php // if there is an $item then we're editing one exiting media item, if not ?>
+<?php // we're part of an annotation of potentially several new items in a bigger form ?>
+
 <?php if (!$item): ?>   
-<li class="a-media-item <?php echo ($n%2) ? "odd" : "even" ?>">
+<li class="a-media-item <?php echo ($n%2) ? "odd" : "even" ?>" id="a-media-item-<?php echo $i ?>">
         <div class="a-media-item-edit-form">
 <?php endif ?>
@@ -19 +22 @@
 <?php if ($item): ?>
 <form method="POST" id="a-media-edit-form" enctype="multipart/form-data" 
-  action="<?php echo url_for(aUrl::addParams("aMedia/editImage",
+  action="<?php echo url_for(aUrl::addParams("aMedia/edit",
     array("slug" => $item->getSlug())))?>">
 <?php endif ?>
-
-                <?php $previewAvailable = aValidatorFilePersistent::previewAvailable($form['file']->getValue()) ?>
-                <?php if ($previewAvailable || $item): ?>
-
-                <div class="a-form-row image">
-                <?php if (0): ?>
-                  <?php // Maybe Rick doesn't want this... ?>
-                  <?php echo $form['file']->renderLabel() ?>
-                <?php endif ?>
-                <?php // But we must have this ?>
-                <?php echo $form['file']->renderError() ?>
-                <?php echo $form['file']->render() ?>
-                <?php else: ?>
-                <div class="a-form-row newfile">
-                <?php echo $form['file']->renderRow() ?>
-                </div>
-                <?php endif ?>
-                </div>
+    
+    <?php // This is how we get the preview (which might be a rendering or a large icon, depending on the type) ?>
+    <?php // outside of the widget. Jamming it into the widget made templating weird ?>
+    <div class="a-form-row preview">
+      <?php echo image_tag($form['file']->getWidget()->getPreviewUrl($form['file']->getValue(), aMediaTools::getOption('gallery_constraints'))) ?>
+      <?php if (!$item): ?>
+        <a class="a-media-remove-file" href="#">x</a>
+        <?php a_js_call('apostrophe.mediaEnableRemoveButton(?)', $i) ?>
+      <?php endif ?>
+    </div>
+    
+    <?php // The label says 'Replace File' now, see BaseaMediaEditForm ?>
+                <div class="a-form-row file">
+      <?php echo $form['file']->renderLabel() ?>
+      <?php echo $form['file']->renderError() ?>
+      <?php echo $form['file']->render() ?>
+    </div>
 
                 <div class="a-form-row title">
@@ -49 +51 @@
                 </div>
 
-                <?php echo $form['id']->render() ?>
                 <div class="a-form-row description">
                         <?php echo $form['description']->renderLabel() ?>

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

@@ -7 +7 @@
         <ul class="a-ui a-controls">
 
-    <?php if ($mediaItem->getType() === 'video'): ?>
-      <li><?php echo link_to(__("Edit", null, 'apostrophe'), "aMedia/editVideo", array("query_string" => http_build_query(array("slug" => $mediaItem->getSlug())), "class" => "a-btn icon a-edit")) ?></li>
-    <?php elseif ($mediaItem->getType() === 'pdf'): ?>
-      <li><?php echo link_to(__("Edit", null, 'apostrophe'), "aMedia/editPdf", array("query_string" => http_build_query(array("slug" => $mediaItem->getSlug())), "class" => "a-btn icon a-edit")) ?></li>
-    <?php else: ?>
-      <li><?php echo link_to(__("Edit", null, 'apostrophe'), "aMedia/editImage", array("query_string" => http_build_query(array("slug" => $mediaItem->getSlug())), "class" => "a-btn icon a-edit")) ?></li>
-    <?php endif ?>
-        
-                <?php if ($mediaItem->getType() !== 'video' && $sf_params->get('action') == 'show'): ?>
+    <li><?php echo link_to(a_("Edit"), "aMedia/edit", array("query_string" => http_build_query(array("slug" => $mediaItem->getSlug())), "class" => "a-btn icon a-edit")) ?></li>
+
+                <?php if ($mediaItem->getDownloadable() && $sf_params->get('action') == 'show'): ?>
           <li class="a-media-download-original">
              <?php // download link ?>

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

@@ -44 +44 @@
 </li>
 
-<?php // Stored as HTML ?>
 <li class="a-media-item-title">
         <h3>
@@ -52 +51 @@
 </li>
 
+<?php // John: you could use $mediaItem->format to choose an icon here. Make sure ?>
+<?php // you have a default icon if it's not on your list of awesome icons ?>
 <li class="a-media-item-description"><?php echo $mediaItem->getDescription() ?></li>
 <?php if ($mediaItem->getWidth()): ?>
@@ -61 +62 @@
 <li class="a-media-item-tags a-media-item-meta"><?php echo __('<span>Tags:</span> %tags%', array('%tags%' => get_partial('aMedia/showTags', array('tags' => $mediaItem->getTags()))), 'apostrophe') ?></li>
 
-<?php if ($mediaItem->getType() === 'pdf'): ?>
+<?php if ($mediaItem->getDownloadable()): ?>
   <li class="a-media-item-link a-media-item-meta">
                 <?php echo __('<span>URL:</span> %urlfield%', array('%urlfield%' => 

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

@@ -5 +5 @@
   $form = isset($form) ? $sf_data->getRaw('form') : null;
 ?>
-<?php use_helper('I18N', 'jQuery', 'a') ?>
+<?php use_helper('a') ?>
 <?php slot('body_class') ?>a-media<?php end_slot() ?>
 
@@ -13 +13 @@
 
         <div class="a-media-toolbar">
-                <h3><?php echo __('Annotate Images', null, 'apostrophe') ?></h3>
+                <h3><?php echo __('Annotate ' . aMediaTools::getBestTypeLabel(), null, 'apostrophe') ?></h3>
         </div>
 
         <div class="a-media-library">                           
-                <form method="POST" action="<?php echo url_for("aMedia/editImages") ?>" enctype="multipart/form-data" id="a-media-edit-form">
+                <form method="POST" action="<?php echo url_for("aMedia/editMultiple") ?>" enctype="multipart/form-data" id="a-media-edit-form">
                 <?php echo $form->renderHiddenFields() ?>
   
-                <input type="hidden" name="active" value="<?php echo implode(",", $active) ?>" />
-
                 <?php $n = 0 ?>
 
@@ -30 +28 @@
                             <?php // (they get nested when embedded forms are present), but ?>
                             <?php // it supports the same methods as a form for rendering purposes ?>
-                            <?php include_partial('aMedia/editImage', 
-                                                                array(
-                                                                        "item" => false, 
-                                                "firstPass" => $firstPass, 
-                                                                        "form" => $form["item-$i"], 
-                                                                        "n" => $n, 
-                                                                        'i' => $i,
-                                                                        'itemFormScripts' => 'false',
-                                                                        )) ?>
+                            
+                            <?php // Please do not remove this div, I need it to implement the remove button ?>
+                            <div id="a-media-editor-<?php echo $i ?>">
+                            <?php include_partial('aMedia/edit', 
+                                                                array(
+                                                                        "item" => false, 
+                                                "firstPass" => $firstPass, 
+                                                                        "form" => $form["item-$i"], 
+                                                                        "n" => $n, 
+                                                                        'i' => $i,
+                                                                        'itemFormScripts' => 'false',
+                                                                        )) ?>
+                                        </div>
                                         <?php $n++ ?>
                           <?php endif ?>
@@ -48 +50 @@
                 <?php //We should wrap this with logic to say 'photo' if only one object has been uploaded ?>
                 <ul class="a-ui a-controls">
-                        <li><input type="submit" name="submit" value="<?php echo __('Save Images', null, 'apostrophe') ?>" class="a-btn a-submit" /></li>
-                        <li><?php echo link_to(__("Cancel", null, 'apostrophe'), "aMedia/resume", array("class"=>"a-btn icon a-cancel")) ?></li>
+                        <li><input type="submit" name="submit" value="<?php echo a_('Save ' . aMediaTools::getBestTypeLabel()) ?>" class="a-btn a-submit" /></li>
+                        <?php // I use a-cancel and a-media-edit-multiple to find and trigger this cancel button in JS ?>
+                        <li><?php echo link_to(a_("Cancel"), "aMedia/resume", array("class"=>"a-btn icon a-media-edit-multiple-cancel")) ?></li>
                 </ul>
                 </form>

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

@@ -17 +17 @@
 
         <div class="a-media-library">                   
-        <?php include_partial('aMedia/editImage', array('item' => $item, 'firstPass' => false, 'form' => $form)) ?>             
+        <?php include_partial('aMedia/edit', array('item' => $item, 'form' => $form)) ?>                
         </div>
-
 </div>

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

@@ -38 +38 @@
         
         <?php if (aMediaTools::userHasUploadPrivilege()): ?>
-   <ul class="a-ui a-controls">
+    <ul class="a-ui a-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 ?>
+      <?php $typeLabel = aMediaTools::getBestTypeLabel() ?>
+      <?php if ($uploadAllowed): ?>
+        <li><a href="<?php echo url_for("aMedia/upload") ?>" class="a-btn icon big a-add"><?php echo a_('Upload ' . $typeLabel) ?></a></li>
+      <?php endif ?>
+      <?php if ($embedAllowed): ?>
+        <li><a href="<?php echo url_for("aMedia/embed") ?>" class="a-btn icon big a-add"><?php echo a_('Embed ' . $typeLabel) ?></a></li>
+      <?php endif ?>
    </ul>
   <?php endif ?>

plugins/apostrophePlugin/trunk/web/js/a.js

@@ -367 +367 @@
         }
         
+        this.mediaEnableRemoveButton = function(i)
+        {
+                var editor = $('#a-media-item-' + i);
+                editor.find('.a-media-remove-file').click(function()
+                {
+                        editor.remove();
+                        if ($('.a-media-item').length == 0)
+                        {
+                                // This is a bit hacky
+                                document.location = $('.a-media-edit-multiple-cancel').attr('href');
+                        }
+                        return false;
+                });
+        }
+        
         // console.log wrapper prevents JS errors if we leave an apostrophe.log call hanging out in our code someplace
         this.log = function(output)