Changeset 1917 for plugins/apostrophePlugin/trunk/modules/aMedia/templates/_describeConstraints.php

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)
• modules/aMedia/templates/_describeConstraints.php (modified) (1 diff)

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 ?>