aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2009-06-20 20:52:39 +0000
committerCash Costello <cash.costello@gmail.com>2009-06-20 20:52:39 +0000
commit1bf62f1bc10831d559df147868dd889e5985adcc (patch)
tree7e2824768e010978853270c831f4a8da9c027207 /views
parent774b7c79bfcdb5d3139ec16152e6955a86093699 (diff)
downloadelgg-1bf62f1bc10831d559df147868dd889e5985adcc.tar.gz
elgg-1bf62f1bc10831d559df147868dd889e5985adcc.tar.bz2
cleaned up icon code - don't need tidypics/icon view anymore - may reinstate it at a later time
Diffstat (limited to 'views')
-rw-r--r--views/default/object/album.php6
-rw-r--r--views/default/object/image.php2
-rw-r--r--views/default/tidypics/icon.php37
3 files changed, 6 insertions, 39 deletions
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 3a5f5a975..ca28d1672 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -64,7 +64,11 @@
$info .= ", <a href=\"{$album->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a>";
$info .= "</p>";
- $icon = "<a href=\"{$album->getURL()}\">" . elgg_view("tidypics/icon", array('album' => true, 'size' => 'small')) . "</a>";
+ //get album cover if one was set
+ if ($album->cover)
+ $icon = "<a href=\"{$album->getURL()}\">" . '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" alt="thumbnail" /></a>';
+ else
+ $icon = "<a href=\"{$album->getURL()}\">" . '<img src="' . $vars['url'] . 'mod/tidypics/graphics/image_error_thumb.png" alt="new album"></a>';
echo elgg_view_listing($icon, $info);
}
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 03ba12a02..d09b721f1 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -78,7 +78,7 @@ if ($photo_tags) {
if ($numcomments)
$info .= ", <a href=\"{$file->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a>";
$info .= "</p>";
- $icon = "<a href=\"{$file->getURL()}\">" . elgg_view("tidypics/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'small')) . "</a>";
+ $icon = "<a href=\"{$file->getURL()}\">" . '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $file_guid . '&size=thumb" alt="' . $title . '" /></a>';
echo elgg_view_listing($icon, $info);
}
diff --git a/views/default/tidypics/icon.php b/views/default/tidypics/icon.php
deleted file mode 100644
index c960bc00b..000000000
--- a/views/default/tidypics/icon.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
- /**
- * Elgg tidypic icon
- * Optionally you can specify a size.
- *
- */
-
- global $CONFIG;
-
-if($vars['album']){
- echo "<img src=\"{$CONFIG->wwwroot}mod/tidypics/graphics/icons/album.gif\" border=\"0\" />";
-}
-else{
-
- $mime = $vars['mimetype'];
- if (isset($vars['thumbnail'])) {
- $thumbnail = $vars['thumbnail'];
- } else {
- $thumbnail = false;
- }
-
- $size = $vars['size'];
- if ($size != 'large') {
- $size = 'small';
- }
-
- if ($thumbnail && strpos($mime, "image/")!==false)
- echo "<img src=\"{$vars['url']}action/tidypics/icon?file_guid={$vars['file_guid']}\" border=\"0\" />";
- else
- {
- if ($size == 'large')
- echo "<img src=\"{$CONFIG->wwwroot}mod/tidypics/graphics/icons/general_lrg.gif\" border=\"0\" />";
- else
- echo "<img src=\"{$CONFIG->wwwroot}mod/tidypics/graphics/icons/general.gif\" border=\"0\" />";
- }
-}
-?> \ No newline at end of file