From 7be26eab54af016c2f64b2316141d40955c6c2f6 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 6 Feb 2011 22:46:47 +0000
Subject: removing old entities views that are no longer needed and did the
 last changes for the icon system

git-svn-id: http://code.elgg.org/elgg/trunk@8054 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/search/views/default/search/entity.php | 10 ++---
 views/default/entities/entity_list.php     | 63 ------------------------------
 views/default/entities/entity_listing.php  | 19 ---------
 views/default/entities/gallery.php         | 42 --------------------
 views/default/entities/gallery_listing.php | 21 ----------
 views/default/entities/list.php            | 63 ------------------------------
 views/default/entities/list_item.php       | 19 ---------
 views/default/graphics/icon.php            | 44 ---------------------
 views/default/object/default.php           |  6 +--
 9 files changed, 4 insertions(+), 283 deletions(-)
 delete mode 100644 views/default/entities/entity_list.php
 delete mode 100644 views/default/entities/entity_listing.php
 delete mode 100644 views/default/entities/gallery.php
 delete mode 100644 views/default/entities/gallery_listing.php
 delete mode 100644 views/default/entities/list.php
 delete mode 100644 views/default/entities/list_item.php
 delete mode 100644 views/default/graphics/icon.php

diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php
index d93a603eb..a967853a3 100644
--- a/mod/search/views/default/search/entity.php
+++ b/mod/search/views/default/search/entity.php
@@ -22,17 +22,13 @@ if (!$icon) {
 	// @todo allow an option to switch to displaying the entity's icon instead.
 	$type = $entity->getType();
 	if ($type == 'user' || $type == 'group') {
-		$icon = elgg_view('profile/icon', array('entity' => $entity, 'size' => 'tiny'));
+		$icon = elgg_view_entity_icon($entity, 'tiny');
 	} elseif ($owner = $entity->getOwnerEntity()) {
-		$icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny'));
+		$icon = elgg_view_entity_icon($owner, 'tiny');
 	} else {
 		// display a generic icon if no owner, though there will probably be
 		// other problems if the owner can't be found.
-		$icon = elgg_view(
-			'graphics/icon', array(
-				'entity' => $entity,
-				'size' => 'tiny',
-				));
+		$icon = elgg_view_entity($entity, 'tiny');
 	}
 }
 
diff --git a/views/default/entities/entity_list.php b/views/default/entities/entity_list.php
deleted file mode 100644
index fd6ea27bb..000000000
--- a/views/default/entities/entity_list.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * View a list of entities
- *
- * @package Elgg
- *
- */
-
-$context = $vars['context'];
-$offset = $vars['offset'];
-$entities = $vars['entities'];
-$limit = $vars['limit'];
-$count = $vars['count'];
-$baseurl = $vars['baseurl'];
-$context = $vars['context'];
-$listtype = $vars['listtype'];
-$pagination = $vars['pagination'];
-$fullview = $vars['fullview'];
-
-$html = "";
-$nav = "";
-
-if (isset($vars['listtypetoggle'])) {
-	$listtypetoggle = $vars['listtypetoggle'];
-} else {
-	$listtypetoggle = true;
-}
-
-if ($context == "search" && $count > 0 && $listtypetoggle) {
-	$nav .= elgg_view('navigation/listtype', array(
-		'baseurl' => $baseurl,
-		'offset' => $offset,
-		'count' => $count,
-		'listtype' => $listtype,
-	));
-}
-
-if ($pagination) {
-	$nav .= elgg_view('navigation/pagination',array(
-		'baseurl' => $baseurl,
-		'offset' => $offset,
-		'count' => $count,
-		'limit' => $limit,
-	));
-}
-
-if ($listtype == 'list') {
-	if (is_array($entities) && sizeof($entities) > 0) {
-		foreach($entities as $entity) {
-			$html .= elgg_view_entity($entity, $fullview);
-		}
-	}
-} else {
-	if (is_array($entities) && sizeof($entities) > 0) {
-		$html .= elgg_view('entities/gallery', array('entities' => $entities));
-	}
-}
-
-if ($count) {
-	$html .= $nav;
-}
-
-echo $html;
\ No newline at end of file
diff --git a/views/default/entities/entity_listing.php b/views/default/entities/entity_listing.php
deleted file mode 100644
index 4b6636db7..000000000
--- a/views/default/entities/entity_listing.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Generic display for a single entity in list view.
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses string $vars['icon'] Full icon HTML to display.
- * @uses string $vars['info'] Info about the entity.
- */
-?>
-<div class="listing entity-listing">
-	<div class="icon">
-		<?php echo $vars['icon']; ?>
-	</div>
-	<div class="info">
-		<?php echo $vars['info']; ?>
-	</div>
-</div>
diff --git a/views/default/entities/gallery.php b/views/default/entities/gallery.php
deleted file mode 100644
index bfdd4d4d8..000000000
--- a/views/default/entities/gallery.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Elgg gallery view
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$entities = $vars['entities'];
-if (is_array($entities) && sizeof($entities) > 0) {
-
-?>
-
-<table class="entity_gallery">
-
-<?php
-
-	$col = 0;
-	foreach($entities as $entity) {
-		if ($col == 0) {
-
-			echo "<tr>";
-
-		}
-		echo "<td class='entity_gallery_item'>";
-		echo elgg_view_entity($entity);
-		echo "</td>";
-		$col++;
-		if ($col > 3) {
-			echo "</tr>";
-			$col = 0;
-		}
-	}
-	if ($col > 0) echo "</tr>";
-
-?>
-
-</table>
-
-<?php
-
-}
\ No newline at end of file
diff --git a/views/default/entities/gallery_listing.php b/views/default/entities/gallery_listing.php
deleted file mode 100644
index 58fa5e26b..000000000
--- a/views/default/entities/gallery_listing.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Generic display for a single entity in gallery view.
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses string $vars['icon'] Full icon HTML to display.
- * @uses string $vars['info'] Info about the entity.
- */
-
-?>
-
-<div class="gallery_listing clearfix">
-	<div class="gallery_listing_icon">
-		<?php echo $vars['icon']; ?>
-	</div>
-	<div class="gallery_listing_info">
-		<?php echo $vars['info']; ?>
-	</div>
-</div>
diff --git a/views/default/entities/list.php b/views/default/entities/list.php
deleted file mode 100644
index 2ddd96ee9..000000000
--- a/views/default/entities/list.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * View a list of entities
- *
- * @package Elgg
- *
- */
-
-$context = $vars['context'];
-$offset = $vars['offset'];
-$entities = $vars['entities'];
-$limit = $vars['limit'];
-$count = $vars['count'];
-$base_url = $vars['baseurl'];
-$context = $vars['context'];
-$list_type = $vars['listtype'];
-$pagination = $vars['pagination'];
-$full_view = $vars['fullview'];
-
-$html = "";
-$nav = "";
-
-$list_type_toggle = elgg_get_array_value('listtypetoggle', $vars, true);
-
-if ($context == "search" && $count > 0 && $list_type_toggle) {
-	$nav .= elgg_view('navigation/listtype', array(
-		'baseurl' => $base_url,
-		'offset' => $offset,
-		'count' => $count,
-		'listtype' => $list_type,
-	));
-}
-
-if ($pagination) {
-	$nav .= elgg_view('navigation/pagination', array(
-		'baseurl' => $base_url,
-		'offset' => $offset,
-		'count' => $count,
-		'limit' => $limit,
-	));
-}
-
-if ($list_type == 'list') {
-	if (is_array($entities) && sizeof($entities) > 0) {
-		$html .= '<ul class="elgg-entity-list elgg-list">';
-		foreach ($entities as $entity) {
-			$html .= '<li>';
-			$html .= elgg_view_entity($entity, $full_view);
-			$html .= '</li>';
-		}
-		$html .= '</ul>';
-	}
-} else {
-	if (is_array($entities) && sizeof($entities) > 0) {
-		$html .= elgg_view('entities/gallery', array('entities' => $entities));
-	}
-}
-
-if ($count) {
-	$html .= $nav;
-}
-
-echo $html;
diff --git a/views/default/entities/list_item.php b/views/default/entities/list_item.php
deleted file mode 100644
index 4b6636db7..000000000
--- a/views/default/entities/list_item.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Generic display for a single entity in list view.
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses string $vars['icon'] Full icon HTML to display.
- * @uses string $vars['info'] Info about the entity.
- */
-?>
-<div class="listing entity-listing">
-	<div class="icon">
-		<?php echo $vars['icon']; ?>
-	</div>
-	<div class="info">
-		<?php echo $vars['info']; ?>
-	</div>
-</div>
diff --git a/views/default/graphics/icon.php b/views/default/graphics/icon.php
deleted file mode 100644
index 06e866d33..000000000
--- a/views/default/graphics/icon.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Generic icon view.
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['entity'] The entity the icon represents - uses getIcon() method
- * @uses $vars['js'] Any JavaScript to add to img tag
- * @uses $vars['size'] topbar, tiny, small, medium (default), large, master
- * @uses $vars['link'] Optional link for the image
- * @uses $vars['align'] Align attribute of the img tag
- */
-
-$entity = $vars['entity'];
-
-$sizes = array('small','medium','large','tiny','master','topbar');
-// Get size
-if (!in_array($vars['size'], $sizes)) {
-	$vars['size'] = "medium";
-}
-
-// Get any align and js
-if (!empty($vars['align'])) {
-	$align = " align=\"{$vars['align']}\" ";
-} else {
-	$align = "";
-}
-
-
-?>
-<div class="icon">
-<?php
-if ($vars['link']) {
-	?><a href="<?php echo $vars['link'] ?>"><?php
-}
-?>
-<img src="<?php echo $entity->getIcon($vars['size']); ?>" <?php echo $align; ?> <?php echo $vars['js']; ?> />
-<?php
-if ($vars['link']) {
-	?></a><?php
-}
-?>
-</div>
\ No newline at end of file
diff --git a/views/default/object/default.php b/views/default/object/default.php
index be2be475e..bcb1b04fd 100644
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -8,11 +8,7 @@
  * @subpackage Core
  */
 
-$icon = elgg_view('graphics/icon', array(
-	'entity' => $vars['entity'],
-	'size' => 'small',
-));
-
+$icon = elgg_view_entity_icon($vars['entity'], 'small');
 
 $title = $vars['entity']->title;
 if (!$title) {
-- 
cgit v1.2.3