diff options
author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-31 13:49:46 +0000 |
---|---|---|
committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-31 13:49:46 +0000 |
commit | 31598136e807ed309c2cd7ea90dfca4da569a52a (patch) | |
tree | 5b4651471f063460df9bf035f737426eb3ae28db | |
parent | 11d0d36d3a3ac38e985e414cc50b9075ddc1f413 (diff) | |
download | elgg-31598136e807ed309c2cd7ea90dfca4da569a52a.tar.gz elgg-31598136e807ed309c2cd7ea90dfca4da569a52a.tar.bz2 |
Logbrowser now using getIcon for graphics
git-svn-id: https://code.elgg.org/elgg/trunk@1628 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r-- | mod/logbrowser/graphics/defaultlarge.jpg | bin | 10840 -> 0 bytes | |||
-rw-r--r-- | mod/logbrowser/graphics/defaultmedium.jpg | bin | 2517 -> 0 bytes | |||
-rw-r--r-- | mod/logbrowser/graphics/defaultsmall.jpg | bin | 1117 -> 0 bytes | |||
-rw-r--r-- | mod/logbrowser/graphics/defaulttiny.jpg | bin | 965 -> 0 bytes | |||
-rw-r--r-- | mod/logbrowser/views/default/logbrowser/gallery.php | 8 | ||||
-rw-r--r-- | mod/logbrowser/views/default/logbrowser/icon.php | 29 | ||||
-rw-r--r-- | mod/logbrowser/views/default/logbrowser/listing.php | 2 |
7 files changed, 2 insertions, 37 deletions
diff --git a/mod/logbrowser/graphics/defaultlarge.jpg b/mod/logbrowser/graphics/defaultlarge.jpg Binary files differdeleted file mode 100644 index 8b7576c47..000000000 --- a/mod/logbrowser/graphics/defaultlarge.jpg +++ /dev/null diff --git a/mod/logbrowser/graphics/defaultmedium.jpg b/mod/logbrowser/graphics/defaultmedium.jpg Binary files differdeleted file mode 100644 index 996efac47..000000000 --- a/mod/logbrowser/graphics/defaultmedium.jpg +++ /dev/null diff --git a/mod/logbrowser/graphics/defaultsmall.jpg b/mod/logbrowser/graphics/defaultsmall.jpg Binary files differdeleted file mode 100644 index 3bda4a3c7..000000000 --- a/mod/logbrowser/graphics/defaultsmall.jpg +++ /dev/null diff --git a/mod/logbrowser/graphics/defaulttiny.jpg b/mod/logbrowser/graphics/defaulttiny.jpg Binary files differdeleted file mode 100644 index a83495ee6..000000000 --- a/mod/logbrowser/graphics/defaulttiny.jpg +++ /dev/null diff --git a/mod/logbrowser/views/default/logbrowser/gallery.php b/mod/logbrowser/views/default/logbrowser/gallery.php index 3ce6e2c43..fb3a7537d 100644 --- a/mod/logbrowser/views/default/logbrowser/gallery.php +++ b/mod/logbrowser/views/default/logbrowser/gallery.php @@ -18,13 +18,7 @@ if (is_callable(array($object, 'getURL'))) $obj_url = $object->getURL(); - $icon = elgg_view( - "logbrowser/icon", array( - 'entity' => $vars['entity'], - 'size' => 'small', - ) - ); - + $info .= "<p><b>"; if ($obj_url) $info .= "<a href=\"$obj_url\">"; $info .= "{$entry->object_class}"; diff --git a/mod/logbrowser/views/default/logbrowser/icon.php b/mod/logbrowser/views/default/logbrowser/icon.php deleted file mode 100644 index 233442f50..000000000 --- a/mod/logbrowser/views/default/logbrowser/icon.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php - /** - * Elgg log browser. - * - * @package ElggLogBrowser - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Marcus Povey - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ - */ - $group = $vars['entity']; - - // Get size - if (!in_array($vars['size'],array('small','medium','large','tiny','master','topbar'))) - $vars['size'] = "medium"; - - // Get any align and js - if (!empty($vars['align'])) { - $align = " align=\"{$vars['align']}\" "; - } else { - $align = ""; - } - - -?> - -<div class="logbrowsericon"> -<img src="<?php echo $vars['url']; ?>mod/logbrowser/graphics/default<?php echo $vars['size']; ?>.jpg" border="0" <?php echo $align; ?> <?php echo $vars['js']; ?> /> -</div>
\ No newline at end of file diff --git a/mod/logbrowser/views/default/logbrowser/listing.php b/mod/logbrowser/views/default/logbrowser/listing.php index 3ce6e2c43..9550dba2e 100644 --- a/mod/logbrowser/views/default/logbrowser/listing.php +++ b/mod/logbrowser/views/default/logbrowser/listing.php @@ -19,7 +19,7 @@ $obj_url = $object->getURL(); $icon = elgg_view( - "logbrowser/icon", array( + "graphics/icon", array( 'entity' => $vars['entity'], 'size' => 'small', ) |