'More' links on serarch results moved, and link added to Tag results

git-svn-id: http://code.elgg.org/elgg/trunk@3690 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 1bd1dedeab41918e70242589837d8ba5116ccefb..b3c8da5cff2dc63aee6c4668c6618003163ef9ad 100644 (file)
--- a/mod/search/views/default/search/comments/listing.php
+++ b/mod/search/views/default/search/comments/listing.php
@@ -46,7 +46,7 @@ $more = ($more_check > 0) ? $more_check : 0;
 if ($more) {
        $title_key = ($more == 1) ? 'comment' : 'comments';
        $more_str = sprintf(elgg_echo('search:more'), $vars['count'], elgg_echo($title_key));
-       $more_link = "<a href=\"$url\">$more_str</a>";
+       $more_link = "<div class='search_listing'><a href=\"$url\">$more_str</a></div>";
 } else {
        $more_link = '';
 }
@@ -96,12 +96,12 @@ foreach ($vars['entities'] as $entity) {
                <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>
+                       <p class="ItemTimestamp">$time</p>
                </div>
        </div>
 ___END;
 }
 
 echo $body;
+echo $more_link;
 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 5a5ecd21822ff3ad4cb5bfb14fe8d59a40d34a93..c8551b9a426b4ae6311f94bd957a3903a41839bc 100644 (file)
--- a/mod/search/views/default/search/listing.php
+++ b/mod/search/views/default/search/listing.php
@@ -55,7 +55,7 @@ $more = ($more_check > 0) ? $more_check : 0;
 if ($more) {
        $title_key = ($more == 1) ? 'comment' : 'comments';
        $more_str = sprintf(elgg_echo('search:more'), $count, $type_str);
-       $more_link = "<a href=\"$url\">$more_str</a>";
+       $more_link = "<div class='search_listing'><a href=\"$url\">$more_str</a></div>";
 } else {
        $more_link = '';
 }
@@ -83,11 +83,11 @@ foreach ($entities as $entity) {
                <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>
+                       <p class="ItemTimestamp">$time</p>
                </div>
        </div>
 ___END;
 }
 echo $body;
-//echo elgg_view('page_elements/contentwrapper', array('body' => $body));
+echo $more_link;
 echo $nav;

diff --git a/mod/search/views/default/search/tags/listing.php b/mod/search/views/default/search/tags/listing.php
index 47a57e973c51d8f4ea2ed446844a99def3e45152..075487295d380dce7a0885deeeabb11187982191 100644 (file)
--- a/mod/search/views/default/search/tags/listing.php
+++ b/mod/search/views/default/search/tags/listing.php
@@ -12,17 +12,39 @@
 
 <?php
 $entities = $vars['entities'];
-$count = $vars['count'];
 
 if (!is_array($vars['entities']) || !count($vars['entities'])) {
        return FALSE;
 }
 
+$query = htmlspecialchars(http_build_query(
+       array(
+               'q' => $vars['params']['query'],
+               'entity_type' => $vars['params']['type'],
+               'entity_subtype' => $vars['params']['subtype'],
+               'limit' => get_input('limit', 10),
+               'offset' => get_input('offset', 0),
+               'search_type' => 'tags',
+       )
+));
+
+$url = "{$vars['url']}pg/search?$query";
+
+// get any more links.
+$more_check = $vars['count'] - ($vars['params']['offset'] + $vars['params']['limit']);
+$more = ($more_check > 0) ? $more_check : 0;
+
+if ($more) {
+       $title_key = ($more == 1) ? 'tag' : 'tags';
+       $more_str = sprintf(elgg_echo('search:more'), $vars['count'], elgg_echo($title_key));
+       $more_link = "<div class='search_listing'><a href=\"$url\">$more_str</a></div>";
+} else {
+       $more_link = '';
+}
+
 $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));
-
 foreach ($entities as $entity) {
        if ($owner = $entity->getOwnerEntity()) {
                $owner_icon = $owner->getIcon('tiny');
@@ -42,4 +64,5 @@ foreach ($entities as $entity) {
        $body .= $entity_html;
 }
 echo $body;
+echo $more_link;
 ?>