Merged Search interface updates

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

diff --git a/mod/search/index.php b/mod/search/index.php
index 88c91486b830fb88f061e5af9509333f379b98c7..ff251dddc684e16156f5072217a2c403850e7c24 100644 (file)
--- 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 f79cfee12c40decf3cc4ed777f3750f719da9e30..5a66ac47cbfb5b41ef2353a4a78e559e0918c96e 100644 (file)
--- 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 82d2d62d1d3e439e702e433458af0de9aa918d1e..625f5c131b53b36d25268631b70de3b7f2a3eb5a 100644 (file)
--- 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']);