aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-04 10:11:51 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-04 10:11:51 +0000
commitf341ec8b331b2f04485885501afeee2875983ed0 (patch)
tree2ca2676cb0d5e02352f2b9fe47fa85286d9c3608
parentff21dfeef43b37009d28945a1924e4bd9b2bc56d (diff)
downloadelgg-f341ec8b331b2f04485885501afeee2875983ed0.tar.gz
elgg-f341ec8b331b2f04485885501afeee2875983ed0.tar.bz2
Merged Search interface updates
git-svn-id: http://code.elgg.org/elgg/trunk@5277 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/search/index.php4
-rw-r--r--mod/search/views/default/search/layout.php2
-rw-r--r--mod/search/views/default/search/startblurb.php8
3 files changed, 5 insertions, 9 deletions
diff --git a/mod/search/index.php b/mod/search/index.php
index 88c91486b..ff251dddc 100644
--- a/mod/search/index.php
+++ b/mod/search/index.php
@@ -132,9 +132,9 @@ foreach ($custom_types as $type) {
// check that we have an actual query
if (!$query) {
$body = elgg_view_title(elgg_echo('search:search_error'));
- $body .= elgg_view('page_elements/contentwrapper', array('body' => elgg_echo('search:no_query')));
+ $body .= elgg_view('page_elements/elgg_content', array('body' => elgg_echo('search:no_query')));
- $layout = elgg_view_layout('two_column_left_sidebar', '', $body);
+ $layout = elgg_view_layout('one_column_with_sidebar', '', $body);
page_draw($title, $layout);
return;
diff --git a/mod/search/views/default/search/layout.php b/mod/search/views/default/search/layout.php
index f79cfee12..5a66ac47c 100644
--- a/mod/search/views/default/search/layout.php
+++ b/mod/search/views/default/search/layout.php
@@ -8,4 +8,4 @@
* @link http://elgg.org/
*/
-echo elgg_view_layout('two_column_left_sidebar', '', $vars['body']); \ No newline at end of file
+echo elgg_view_layout('one_column_with_sidebar', '', $vars['body']); \ No newline at end of file
diff --git a/mod/search/views/default/search/startblurb.php b/mod/search/views/default/search/startblurb.php
index 82d2d62d1..625f5c131 100644
--- a/mod/search/views/default/search/startblurb.php
+++ b/mod/search/views/default/search/startblurb.php
@@ -5,9 +5,5 @@
* @author Curverider Ltd
* @link http://elgg.org/
*/
-?>
-<div class="contentWrapper">
-<?php
- echo sprintf(elgg_echo("tag:search:startblurb"), $vars['query']);
-?>
-</div> \ No newline at end of file
+
+echo sprintf(elgg_echo("tag:search:startblurb"), $vars['query']);