summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Render.pm7
-rw-r--r--doc/templates.mdwn3
-rw-r--r--templates/page.tmpl6
3 files changed, 11 insertions, 5 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8375cfe7a..23f6b1c72 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -407,9 +407,10 @@ sub estcfg () { #{{{
);
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 ($;@) { #{{{
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 6b9fc0218..e27a00a89 100644
--- 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.
+* `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:
diff --git a/templates/page.tmpl b/templates/page.tmpl
index fb7383acb..c9ec2a34f 100644
--- 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">
-<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" />
+</div>
+</form>
</TMPL_IF>
</div>