From f9aa70c258578d907cdeb1e9d5b26fffca5bede6 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 9 Oct 2009 19:33:33 +0000
Subject: Pulled in Justin's search changes from github.

git-svn-id: http://code.elgg.org/elgg/trunk@3520 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/search/entity_list.php     | 62 --------------------------------
 views/default/search/gallery.php         | 49 -------------------------
 views/default/search/gallery_listing.php | 35 ------------------
 views/default/search/listing.php         | 45 -----------------------
 views/default/search/startblurb.php      |  8 -----
 5 files changed, 199 deletions(-)
 delete mode 100644 views/default/search/entity_list.php
 delete mode 100644 views/default/search/gallery.php
 delete mode 100644 views/default/search/gallery_listing.php
 delete mode 100644 views/default/search/listing.php
 delete mode 100644 views/default/search/startblurb.php

(limited to 'views/default/search')

diff --git a/views/default/search/entity_list.php b/views/default/search/entity_list.php
deleted file mode 100644
index f0438fa11..000000000
--- a/views/default/search/entity_list.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-		$context = $vars['context'];
-		$offset = $vars['offset'];
-		$entities = $vars['entities'];
-		$limit = $vars['limit'];
-		$count = $vars['count'];
-		$baseurl = $vars['baseurl'];
-		$context = $vars['context'];
-		$viewtype = $vars['viewtype'];
-		$pagination = $vars['pagination'];
-		$fullview = $vars['fullview']; 
-		
-		$html = "";
-		$nav = "";
-		
-		if (isset($vars['viewtypetoggle'])) {
-			$viewtypetoggle = $vars['viewtypetoggle'];
-		} else {
-			$viewtypetoggle = true;
-		}
-
-			if ($context == "search" && $count > 0 && $viewtypetoggle) {
-				$nav .= elgg_view("navigation/viewtype",array(
-			
-												'baseurl' => $baseurl,
-												'offset' => $offset,
-												'count' => $count,
-												'viewtype' => $viewtype,
-			
-														));
-			}
-			
-			if ($pagination)
-				$nav .= elgg_view('navigation/pagination',array(
-			
-												'baseurl' => $baseurl,
-												'offset' => $offset,
-												'count' => $count,
-												'limit' => $limit,
-			
-														));
-			
-			$html .= $nav;
-
-			if ($viewtype == "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("search/gallery",array('entities' => $entities));
-			}
-			
-			if ($count)
-				$html .= $nav;
-				
-			echo $html;
-
-?>
diff --git a/views/default/search/gallery.php b/views/default/search/gallery.php
deleted file mode 100644
index 366cd713b..000000000
--- a/views/default/search/gallery.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-	/**
-	 * Elgg gallery view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.org/
-	 */
-
-		$entities = $vars['entities'];
-		if (is_array($entities) && sizeof($entities) > 0) {
-			
-?>
-
-		<table class="search_gallery">
-
-<?php
-			
-			$col = 0;
-			foreach($entities as $entity) {
-				if ($col == 0) {
-					
-					echo "<tr>";
-					
-				}
-				echo "<td class=\"search_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/search/gallery_listing.php b/views/default/search/gallery_listing.php
deleted file mode 100644
index 4c0f40643..000000000
--- a/views/default/search/gallery_listing.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-	/**
-	 * Elgg search listing: gallery view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.org/
-	 */
-
-?>
-
-	<div class="search_listing">
-	
-		<div class="search_listing_header">
-			
-				<?php
-	
-					echo $vars['icon'];
-				
-				?>
-			
-		</div>
-		<div class="search_listing_info">
-			<?php
-
-				echo $vars['info'];
-			
-			?>
-		</div>		
-	
-	</div>
\ No newline at end of file
diff --git a/views/default/search/listing.php b/views/default/search/listing.php
deleted file mode 100644
index 0a9d01fee..000000000
--- a/views/default/search/listing.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-	/**
-	 * Elgg search listing
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.org/
-	 */
-
-	if (isset($vars['search_viewtype']) && $vars['search_viewtype'] == "gallery") {
-		
-		echo elgg_view("search/gallery_listing",$vars);
-		
-	} else {
-
-?>
-
-	<div class="search_listing">
-	
-		<div class="search_listing_icon">
-			<?php
-
-				echo $vars['icon'];
-			
-			?>
-		</div>
-		<div class="search_listing_info">
-			<?php
-
-				echo $vars['info'];
-			
-			?>
-		</div>		
-	
-	</div>
-	
-<?php
-
-	}
-
-?>
\ No newline at end of file
diff --git a/views/default/search/startblurb.php b/views/default/search/startblurb.php
deleted file mode 100644
index 82b4aef8c..000000000
--- a/views/default/search/startblurb.php
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div class="contentWrapper">
-	<?php 
-	
-		echo sprintf(elgg_echo("tag:search:startblurb"),$vars['tag']); 
-	
-	?>
-</div>
\ No newline at end of file
-- 
cgit v1.2.3