Search UI cleaned up

git-svn-id: http://code.elgg.org/elgg/trunk@3689 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/search/views/default/search/comments/listing.php b/mod/search/views/default/search/comments/listing.php
index 13f368f2b7c680d6e34f34387d7f73cf431d4af8..1bd1dedeab41918e70242589837d8ba5116ccefb 100644 (file)
--- 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 fe983c790bf07550f9a64ac1b9662e05bb1dafbc..5a5ecd21822ff3ad4cb5bfb14fe8d59a40d34a93 100644 (file)
--- 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 9b229b3496f1281373ee7b20b06f11d5767ccb51..47a57e973c51d8f4ea2ed446844a99def3e45152 100644 (file)
--- 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