fixes

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8375cfe7a9d3e984253f417415e12a8927baa51f..23f6b1c723d8f97b3bc6c3ac2f24ea4cca9067c5 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -407,9 +407,10 @@ sub estcfg () { #{{{
        );
        print TEMPLATE $template->output;
        close TEMPLATE;
        );
        print TEMPLATE $template->output;
        close TEMPLATE;

-       symlink("/usr/lib/estraier/estseek.cgi",
-               "$estdir/".basename($config{cgiurl})) ||
-                       error("symlink: $!");
+       $cgi="$estdir/".basename($config{cgiurl});
+       unlink($cgi);
+       symlink("/usr/lib/estraier/estseek.cgi", $cgi) ||
+               error("symlink $cgi: $!");

 } # }}}
 
 sub estcmd ($;@) { #{{{
 } # }}}
 
 sub estcmd ($;@) { #{{{

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 6b9fc02188c24dc92a5713104bfb54cb4e3f86e4..e27a00a8971a04803c216cad63ec25fda5f9f88f 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -18,6 +18,9 @@ It ships with some basic templates which can be customised:
   page.
 * `templates/inlinepagetitle.tmpl` - Used for listing a page inline in a blog
   archive page.
   page.
 * `templates/inlinepagetitle.tmpl` - Used for listing a page inline in a blog
   archive page.

+* `estseek.conf` - Not a html template, this is actually a template for
+  a config file for the [[HyperEstraier]] search engine. If you like you
+  can read the [[HyperEstraier]] docs and configure it using this.

 
 If you like, you can add these to further customise it:
 
 
 If you like, you can add these to further customise it:
 

diff --git a/templates/page.tmpl b/templates/page.tmpl
index fb7383acb2f6060e80e1fab8ed35ece5a65306c1..c9ec2a34ff065e40d5557cdd2b3c61ae9802b177 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -17,10 +17,12 @@
 </h1>
 <TMPL_IF NAME="HYPERESTRAIERURL">
 <form method="get" action="<TMPL_VAR HYPERESTRAIERURL>" id="searchform">
 </h1>
 <TMPL_IF NAME="HYPERESTRAIERURL">
 <form method="get" action="<TMPL_VAR HYPERESTRAIERURL>" id="searchform">

-<input type="text" name="phrase" value="" size="32" />
-<input type="submit" value="Search" />
+<div>
+<input type="text" name="phrase" value="" size="16" />

 <input type="hidden" name="enc" value="UTF-8" />
 <input type="hidden" name="do" value="hyperestraier" />
 <input type="hidden" name="enc" value="UTF-8" />
 <input type="hidden" name="do" value="hyperestraier" />

+</div>
+</form>

 </TMPL_IF>
 </div>
 
 </TMPL_IF>
 </div>