urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* The search plugin needs to override <base> to point to the directory 

containing ikiwiki.cgi, but this should not change the urls to the style
  sheets etc. Add a new forcebareurl parameter to misctemplate to allow
  it to do that.
master
Joey Hess 2008-02-14 15:20:49 -05:00
parent 9192a88375
commit 8be2b60aac
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/search.pm
View File

@ -96,7 +96,7 @@ sub estcfg () { #{{{
open(TEMPLATE, ">:utf8", $newfile) || error("open $newfile: $!", $cleanup);
print TEMPLATE IkiWiki::misctemplate("search",
"<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n",
baseurl => IkiWiki::dirname($config{cgiurl})."/") ||
forcebaseurl => IkiWiki::dirname($config{cgiurl})."/") ||
error("write $newfile: $!", $cleanup);
close TEMPLATE || error("save $newfile: $!", $cleanup);
rename($newfile, "$estdir/$cgi.tmpl") ||

4
debian/changelog vendored
View File

@ -23,6 +23,10 @@ ikiwiki (2.40) UNRELEASED; urgency=low
* Setting NOTAINT=1 had no effect when building ikiwiki itself, fix this.
* Depend on HTML::Scrubber, since the scrubber is enabled by default and
dies if its can't be loaded.
* The search plugin needs to override <base> to point to the directory
containing ikiwiki.cgi, but this should not change the urls to the style
sheets etc. Add a new forcebareurl parameter to misctemplate to allow
it to do that.
-- Josh Triplett <josh@freedesktop.org> Sun, 10 Feb 2008 13:18:58 -0800

3
doc/bugs/search_plugin_uses_wrong_css_path.mdwn
View File

@ -9,3 +9,6 @@ Maybe misctemplate() and misc.tmpl should use an additional
variable which points always to the base of the wiki.
e.g. use "wikibase" for css and favicon and "baseurl" for the &lt;base&gt; tag.
> thanks for pointing this bug out, I've fixed it --[[Joey]].
[[tag done]]

4
templates/misc.tmpl
View File

@ -2,7 +2,11 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<TMPL_IF NAME="FORCEBASEURL">
<base href="<TMPL_VAR FORCEBASEURL>" />
<TMPL_ELSE>
<base href="<TMPL_VAR BASEURL>" />
</TMPL_IF>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><TMPL_VAR TITLE></title>
<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />