aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-08 20:17:41 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-08 20:17:41 +0000
commit617ebb97d840cf77f3b483273f029732e8dc0db7 (patch)
tree813abbbe3845d737f5e41766d677b9dcac134fa5 /views/default
parentf2b5b81e01444f90f00baef738d02422cbaf6e20 (diff)
downloadelgg-617ebb97d840cf77f3b483273f029732e8dc0db7.tar.gz
elgg-617ebb97d840cf77f3b483273f029732e8dc0db7.tar.bz2
Removed hard-coded search box and replaced with extended header/extend view from search page.
git-svn-id: http://code.elgg.org/elgg/trunk@5309 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/page_elements/elgg_header.php8
-rw-r--r--views/default/page_elements/html_begin.php6
2 files changed, 4 insertions, 10 deletions
diff --git a/views/default/page_elements/elgg_header.php b/views/default/page_elements/elgg_header.php
index 565368607..0f99334df 100644
--- a/views/default/page_elements/elgg_header.php
+++ b/views/default/page_elements/elgg_header.php
@@ -13,13 +13,5 @@
// insert a view which can be extended
echo elgg_view('header/extend');
?>
-
- <div id="elgg_search">
- <form id="searchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
- <input type="text" size="21" name="tag" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search_input" />
- <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search_submit_button" />
- </form>
- </div>
-
</div>
</div> \ No newline at end of file
diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php
index 68a6950c2..2784f2629 100644
--- a/views/default/page_elements/html_begin.php
+++ b/views/default/page_elements/html_begin.php
@@ -2,6 +2,7 @@
/**
* Start html output.
* The standard HTML header that displays across the site
+ *
* @uses $vars['config'] The site configuration settings, imported
* @uses $vars['title'] The page title
* @uses $vars['body'] The main content of the page
@@ -57,7 +58,9 @@ $release = get_version(true);
<?php
echo $feedref;
- echo elgg_view('metatags',$vars);
+ if (elgg_view_exists('metatags')) {
+ echo elgg_view('metatags', $vars);
+ }
// this was previously required because of an odd browser canvas drawing bug
// in firefox. It seems to not be require with the new layout...?
@@ -65,7 +68,6 @@ $release = get_version(true);
// jQuery(document).ready(function($) {
// });
// </script>
-
?>
<?php