From 70b08afa64465f4d3457ba6e1c4cc2df1dd2069b Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 16 Oct 2009 20:41:31 +0000
Subject: More views cleanup.

git-svn-id: http://code.elgg.org/elgg/trunk@3556 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/search/entity_list.php     | 118 ++++++++++++++++---------------
 views/default/search/gallery.php         |  71 +++++++++----------
 views/default/search/gallery_listing.php |  53 +++++++-------
 views/default/search/listing.php         |  69 ++++++++----------
 views/default/search/startblurb.php      |  17 +++--
 5 files changed, 161 insertions(+), 167 deletions(-)

(limited to 'views/default/search')

diff --git a/views/default/search/entity_list.php b/views/default/search/entity_list.php
index f0438fa11..07e76e955 100644
--- a/views/default/search/entity_list.php
+++ b/views/default/search/entity_list.php
@@ -1,62 +1,64 @@
 <?php
+/**
+ * @package Elgg
+ * @author Curverider
+ * @link http://elgg.com/
+ */
 
-		$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;
+$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;
+}
 
-			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;
-
-?>
+echo $html;
\ No newline at end of file
diff --git a/views/default/search/gallery.php b/views/default/search/gallery.php
index 366cd713b..52c4d0b92 100644
--- a/views/default/search/gallery.php
+++ b/views/default/search/gallery.php
@@ -1,49 +1,44 @@
 <?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) {
 
-	/**
-	 * 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">
+<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;
-			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>";
-			
+		}
+	}
+	if ($col > 0) echo "</tr>";
+
 ?>
 
-		</table>
+</table>
 
 <?php
-			
-		}
-		
-?>
\ No newline at end of file
+
+}
\ No newline at end of file
diff --git a/views/default/search/gallery_listing.php b/views/default/search/gallery_listing.php
index 4c0f40643..900b22832 100644
--- a/views/default/search/gallery_listing.php
+++ b/views/default/search/gallery_listing.php
@@ -1,35 +1,32 @@
 <?php
-
-	/**
-	 * Elgg search listing: gallery view
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.org/
-	 */
+/**
+ * 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">
+<div class="search_listing">
+
+	<div class="search_listing_header">
+
 			<?php
 
-				echo $vars['info'];
-			
+				echo $vars['icon'];
+
 			?>
-		</div>		
-	
-	</div>
\ No newline at end of file
+
+	</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
index 0a9d01fee..fa1719069 100644
--- a/views/default/search/listing.php
+++ b/views/default/search/listing.php
@@ -1,45 +1,38 @@
 <?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 {
+/**
+ * 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 class="search_listing">
+
+	<div class="search_listing_icon">
+		<?php
+
+			echo $vars['icon'];
+
+		?>
 	</div>
-	
-<?php
+	<div class="search_listing_info">
+		<?php
 
-	}
+			echo $vars['info'];
+
+		?>
+	</div>
+
+</div>
+
+<?php
 
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/views/default/search/startblurb.php b/views/default/search/startblurb.php
index 82b4aef8c..7c78cbf16 100644
--- a/views/default/search/startblurb.php
+++ b/views/default/search/startblurb.php
@@ -1,8 +1,15 @@
-
+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+?>
 <div class="contentWrapper">
-	<?php 
-	
-		echo sprintf(elgg_echo("tag:search:startblurb"),$vars['tag']); 
-	
+	<?php
+
+		echo sprintf(elgg_echo("tag:search:startblurb"),$vars['tag']);
+
 	?>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3