aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-11 16:17:54 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-11 16:17:54 +0000
commit82932ce389d39457e5584aadfc8abadb8404520a (patch)
tree4ec3cdb3517a1d744e7d2b47f9125e32bdac8d2a
parent659e40dce76c1599f0c72c786ebafa264e6214f7 (diff)
downloadelgg-82932ce389d39457e5584aadfc8abadb8404520a.tar.gz
elgg-82932ce389d39457e5584aadfc8abadb8404520a.tar.bz2
Clearer titles for search
git-svn-id: https://code.elgg.org/elgg/trunk@1841 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--languages/en.php1
-rw-r--r--search/index.php16
2 files changed, 14 insertions, 3 deletions
diff --git a/languages/en.php b/languages/en.php
index de6fd03dd..6fd0d30f4 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -347,6 +347,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'search' => "Search",
'searchtitle' => "Search: %s",
+ 'advancedsearchtitle' => "%s with results matching %s",
'notfound' => "No results found.",
'next' => "Next",
'previous' => "Previous",
diff --git a/search/index.php b/search/index.php
index 5ee39f026..f6b6b04be 100644
--- a/search/index.php
+++ b/search/index.php
@@ -50,15 +50,25 @@
}
+ if (empty($objecttype) && empty($subtype)) {
+ $title = sprintf(elgg_echo('searchtitle'),$tag);
+ } else {
+ if (empty($objecttype)) $objecttype = 'object';
+ $itemtitle = 'item:' . $objecttype;
+ if (!empty($subtype)) $itemtitle .= ':' . $subtype;
+ $itemtitle = elgg_echo($itemtitle);
+ $title = sprintf(elgg_echo('advancedsearchtitle'),$itemtitle,$tag);
+ }
+
if (!empty($tag)) {
$body = "";
- $body .= elgg_view_title(sprintf(elgg_echo('searchtitle'),$tag));
+ $body .= elgg_view_title($title); // elgg_view_title(sprintf(elgg_echo('searchtitle'),$tag));
$body .= trigger_plugin_hook('search','',$tag,"");
- $body .= elgg_view('search/startblurb',array('tag' => $tag));
+ // $body .= elgg_view('search/startblurb',array('tag' => $tag));
$body .= list_entities_from_metadata($md_type, $tag, $objecttype, $subtype, $owner_guid_array, 10, false, false);
$body = elgg_view_layout('two_column_left_sidebar','',$body);
}
- page_draw(sprintf(elgg_echo('searchtitle'),$tag),$body);
+ page_draw($title,$body);
?> \ No newline at end of file