3 files changed, 22 insertions, 29 deletions
diff --git a/mod/search/views/default/search/comments/listing.php b/mod/search/views/default/search/comments/listing.php
index 13f368f2b..1bd1dedea 100644
--- a/mod/search/views/default/search/comments/listing.php
+++ b/mod/search/views/default/search/comments/listing.php
@@ -92,15 +92,16 @@ foreach ($vars['entities'] as $entity) {
 	$time = friendly_time($tc);
 
 	$body .= <<<___END
-<span class="searchListing">
-	<h3 class="searchTitle">$title</h3>
-	<span class="searchDetails">
-		<span class="searchDescription">$description</span><br />
-		$icon $time - $more_link</a>
-	</span>
-</span>
+	<div class="search_listing">
+		<div class="search_listing_icon">$icon</div>
+		<div class="search_listing_info">
+			<p class="ItemTitle">$title</p>$description
+			<p class="ItemTimestamp">$time - $more_link</p>
+		</div>
+	</div>
 ___END;
 }
 
-$body .= $nav;
-echo elgg_view('page_elements/contentwrapper', array('body' => $body));
+echo $body;
+echo $nav;
+//echo elgg_view('page_elements/contentwrapper', array('body' => $body));
diff --git a/mod/search/views/default/search/listing.php b/mod/search/views/default/search/listing.php
index fe983c790..5a5ecd218 100644
--- a/mod/search/views/default/search/listing.php
+++ b/mod/search/views/default/search/listing.php
@@ -79,13 +79,15 @@ foreach ($entities as $entity) {
 	$time = friendly_time(($tu > $tc) ? $tu : $tc);
 
 	$body .= <<<___END
-<span class="searchListing">
-	<h3 class="searchTitle">$title</h3>
-	<span class="searchDescription">$description</span><br />
-	<span class="searchInfo">$icon $time - $more_link</span>
-</span>
+	<div class="search_listing">
+		<div class="search_listing_icon">$icon</div>
+		<div class="search_listing_info">
+			<p class="ItemTitle">$title</p>$description
+			<p class="ItemTimestamp">$time - $more_link</p>
+		</div>
+	</div>
 ___END;
 }
-
-echo elgg_view('page_elements/contentwrapper', array('body' => $body));
+echo $body;
+//echo elgg_view('page_elements/contentwrapper', array('body' => $body));
 echo $nav;
diff --git a/mod/search/views/default/search/tags/listing.php b/mod/search/views/default/search/tags/listing.php
index 9b229b349..47a57e973 100644
--- a/mod/search/views/default/search/tags/listing.php
+++ b/mod/search/views/default/search/tags/listing.php
@@ -9,7 +9,6 @@
  */
 ?>
 
-<div class="search_listing">
 
 <?php
 $entities = $vars['entities'];
@@ -22,7 +21,7 @@ if (!is_array($vars['entities']) || !count($vars['entities'])) {
 $title_str = elgg_echo("item:{$vars['params']['type']}:{$vars['params']['subtype']}");
 $body = elgg_view_title(elgg_echo('tags'));
 
-echo elgg_view('page_elements/contentwrapper', array('body' => $body));
+//echo elgg_view('page_elements/contentwrapper', array('body' => $body));
 
 foreach ($entities as $entity) {
 	if ($owner = $entity->getOwnerEntity()) {
@@ -40,16 +39,7 @@ foreach ($entities as $entity) {
 	$tu = $entity->time_updated;
 	$time = friendly_time(($tu > $tc) ? $tu : $tc);
 
-	echo <<<___END
-<span class="searchListing">
-	<h3 class="searchTitle">$title</h3>
-	<span class="searchDetails">
-		$entity_html
-		$tags
-	</span>
-</span>
-___END;
+	$body .= $entity_html;
 }
-
+echo $body;
 ?>
-</div>
-\ No newline at end of file