From 617ebb97d840cf77f3b483273f029732e8dc0db7 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 8 Mar 2010 20:17:41 +0000
Subject: 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
---
 views/default/page_elements/elgg_header.php | 8 --------
 views/default/page_elements/html_begin.php  | 6 ++++--
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'views/default/page_elements')

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
-- 
cgit v1.2.3