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

5 files changed, 34 insertions, 35 deletions

diff --git a/mod/search/start.php b/mod/search/start.php
index a6a0bead2..3467420b7 100644
--- a/mod/search/start.php
+++ b/mod/search/start.php
@@ -1,12 +1,12 @@
 <?php
 /**
-   * Elgg core search.
-   *
-   * @package Elgg
-   * @subpackage Core
-   * @author Curverider Ltd <info@elgg.com>, The MITRE Corporation <http://www.mitre.org>
-   * @link http://elgg.org/
-   */
+ * Elgg core search.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd <info@elgg.com>, The MITRE Corporation <http://www.mitre.org>
+ * @link http://elgg.org/
+ */
 
 /**
  * Initialise search helper functions.
@@ -51,6 +51,9 @@ function search_init() {
 
 	// add in CSS for search elements
 	elgg_extend_view('css', 'search/css');
+
+	// extend view for elgg topbar search box
+	elgg_extend_view('header/extend', 'search/search_box');
 }
 
 /**
diff --git a/mod/search/views/default/page_elements/searchbox.php b/mod/search/views/default/page_elements/searchbox.php
deleted file mode 100644
index f70a6ad97..000000000
--- a/mod/search/views/default/page_elements/searchbox.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-if (array_key_exists('value', $vars)) {
-	$value = $vars['value'];
-} elseif ($value = get_input('q', get_input('tag', NULL))) {
-	$value = $value;
-} else {
-	$value = elgg_echo('search');
-}
-
-$value = stripslashes($value);
-
-?>
-
-<form id="searchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
-	<input type="text" size="21" name="q" value="<?php echo $value; ?>" onclick="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>
diff --git a/mod/search/views/default/search/search_box.php b/mod/search/views/default/search/search_box.php
new file mode 100644
index 000000000..d53efca21
--- /dev/null
+++ b/mod/search/views/default/search/search_box.php
@@ -0,0 +1,20 @@
+<?php
+
+if (array_key_exists('value', $vars)) {
+	$value = $vars['value'];
+} elseif ($value = get_input('q', get_input('tag', NULL))) {
+	$value = $value;
+} else {
+	$value = elgg_echo('search');
+}
+
+$value = stripslashes($value);
+
+?>
+
+<div id="elgg_search">
+	<form id="searchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
+		<input type="text" size="21" name="q" 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>
\ No newline at end of file
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