aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/search/views/default/search/comments/listing.php6
-rw-r--r--mod/search/views/default/search/listing.php6
-rw-r--r--mod/search/views/default/search/tags/listing.php29
3 files changed, 32 insertions, 9 deletions
diff --git a/mod/search/views/default/search/comments/listing.php b/mod/search/views/default/search/comments/listing.php
index 1bd1dedea..b3c8da5cf 100644
--- 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 5a5ecd218..c8551b9a4 100644
--- 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 47a57e973..075487295 100644
--- 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;
?>