Separate thumbnails out into var/thumbs. This clears up some ambiguity in Item_Model and simplifies

file_proxy.  It also means we can stop munging file names in the var/resizes hierarchy.

In the process, rename "thumbnail" to "thumb" everywhere in honor of
Chad (well, ok because it's shorter)..

2 files changed, 12 insertions, 12 deletions

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index addd6c3a..d76e0618 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -12,17 +12,17 @@
   <? $album_class = "gAlbum "; ?>
   <? endif ?>
   <li class="gItem <?= $album_class ?>">
-    <?= $theme->thumbnail_top($child) ?>
+    <?= $theme->thumb_top($child) ?>
     <a href="<?= url::site("{$child->type}s/{$child->id}") ?>">
       <img id="gPhotoID-<?= $child->id ?>" class="gThumbnail"
-           alt="photo" src="<?= $child->thumbnail_url() ?>"
-           width="<?= $child->thumbnail_width ?>"
-           height="<?= $child->thumbnail_height ?>" />
+           alt="photo" src="<?= $child->thumb_url() ?>"
+           width="<?= $child->thumb_width ?>"
+           height="<?= $child->thumb_height ?>" />
     </a>
     <h2><?= $child->title_edit ?></h2>
-    <?= $theme->thumbnail_bottom($child) ?>
+    <?= $theme->thumb_bottom($child) ?>
     <ul class="gMetadata">
-      <?= $theme->thumbnail_info($child) ?>
+      <?= $theme->thumb_info($child) ?>
     </ul>
   </li>
   <? endforeach ?>
diff --git a/themes/default/views/tag.html.php b/themes/default/views/tag.html.php
index 4c507d0d..6be16e43 100644
--- a/themes/default/views/tag.html.php
+++ b/themes/default/views/tag.html.php
@@ -13,17 +13,17 @@
   <? $album_class = "gAlbum "; ?>
   <? endif ?>
   <li class="gItem <?= $album_class ?>">
-    <?= $theme->thumbnail_top($child) ?>
+    <?= $theme->thumb_top($child) ?>
     <a href="<?= url::site("{$child->type}s/{$child->id}") ?>">
       <img id="gPhotoID-<?= $child->id ?>" class="gThumbnail"
-           alt="photo" src="<?= $child->thumbnail_url() ?>"
-           width="<?= $child->thumbnail_width ?>"
-           height="<?= $child->thumbnail_height ?>" />
+           alt="photo" src="<?= $child->thumb_url() ?>"
+           width="<?= $child->thumb_width ?>"
+           height="<?= $child->thumb_height ?>" />
     </a>
     <h2><?= $child->title_edit ?></h2>
-    <?= $theme->thumbnail_bottom($child) ?>
+    <?= $theme->thumb_bottom($child) ?>
     <ul class="gMetadata">
-      <?= $theme->thumbnail_info($child) ?>
+      <?= $theme->thumb_info($child) ?>
     </ul>
   </li>
   <? endforeach ?>