* The page name and parent links has switched from using a <h1> to a styled

  <span>, so pages can use <h1> internally instead of needing to use <h2>.
* Updated all of ikiwiki's own wiki pages for that.
* Add pagetemplate hook, which can be used by plugins that want to mess
  around with adding new stuff to the page template.
* Remove headercontent; the search plugin now adds the search box to the
  header by registering a pagetemplate hook, and other plugins should do
  similarly.

1 files changed, 10 insertions, 2 deletions

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 213ed45ff..c94974ac4 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -9,6 +9,8 @@ use IkiWiki;
 sub import { #{{{
 	IkiWiki::hook(type => "checkconfig", id => "hyperestraier",
 		call => \&checkconfig);
+	IkiWiki::hook(type => "pagetemplate", id => "hyperestraier",
+		call => \&pagetemplate);
 	IkiWiki::hook(type => "delete", id => "hyperestraier",
 		call => \&delete);
 	IkiWiki::hook(type => "change", id => "hyperestraier",
@@ -23,8 +25,14 @@ sub checkconfig () { #{{{
 			IkiWiki::error("Must specify $required when using the search plugin\n");
 		}
 	}
+} #}}}
+
+sub pagetemplate ($$) { #{{{
+	my $page=shift;
+	my $template=shift;
 
-	$IkiWiki::config{headercontent}.=qq{
+	# Add search box to page header.
+	$template->param(searchform => qq{
 <form method="get" action="$IkiWiki::config{cgiurl}" id="searchform">
 <div>
 <input type="text" name="phrase" value="" size="16" />
@@ -32,7 +40,7 @@ sub checkconfig () { #{{{
 <input type="hidden" name="do" value="hyperestraier" />
 </div>
 </form>
-};
+});
 } #}}}
 
 sub delete (@) { #{{{