* Fixed a bug with previews of subpages having broken links to top-level
pages. * Change how the stylesheet url is determined in the templates: Remove STYLEURL and add BASEURL to all templates (some already had it). This new more general variable can be used to link to other things (eg, images) from the template, as well as stylesheets.master
joey
parent
0dc0d8e3b5
commit
cf3021ef3f
|
|
@ -304,14 +304,14 @@ sub cgiurl (@) { #{{{
|
|||
return $config{cgiurl}."?".join("&", map "$_=$params{$_}", keys %params);
|
||||
} #}}}
|
||||
|
||||
sub styleurl (;$) { #{{{
|
||||
sub baseurl (;$) { #{{{
|
||||
my $page=shift;
|
||||
|
||||
return "$config{url}/style.css" if ! defined $page;
|
||||
return "$config{url}/" if ! defined $page;
|
||||
|
||||
$page=~s/[^\/]+$//;
|
||||
$page=~s/[^\/]+\//..\//g;
|
||||
return $page."style.css";
|
||||
return $page;
|
||||
} #}}}
|
||||
|
||||
sub abs2rel ($$) { #{{{
|
||||
|
|
@ -476,8 +476,7 @@ sub misctemplate ($$) { #{{{
|
|||
indexlink => indexlink(),
|
||||
wikiname => $config{wikiname},
|
||||
pagebody => $pagebody,
|
||||
styleurl => styleurl(),
|
||||
baseurl => "$config{url}/",
|
||||
baseurl => baseurl(),
|
||||
);
|
||||
return $template->output;
|
||||
}#}}}
|
||||
|
|
|
|||
|
|
@ -70,8 +70,7 @@ sub cgi_recentchanges ($) { #{{{
|
|||
indexlink => indexlink(),
|
||||
wikiname => $config{wikiname},
|
||||
changelog => [rcs_recentchanges(100)],
|
||||
styleurl => styleurl(),
|
||||
baseurl => "$config{url}/",
|
||||
baseurl => baseurl(),
|
||||
);
|
||||
print $q->header(-charset=>'utf-8'), $template->output;
|
||||
} #}}}
|
||||
|
|
@ -100,7 +99,7 @@ sub cgi_signin ($$) { #{{{
|
|||
header => 0,
|
||||
template => (-e "$config{templatedir}/signin.tmpl" ?
|
||||
{template_params("signin.tmpl")} : ""),
|
||||
stylesheet => styleurl(),
|
||||
stylesheet => baseurl()."style.css",
|
||||
);
|
||||
|
||||
decode_form_utf8($form);
|
||||
|
|
@ -267,7 +266,7 @@ sub cgi_prefs ($$) { #{{{
|
|||
action => $config{cgiurl},
|
||||
template => (-e "$config{templatedir}/prefs.tmpl" ?
|
||||
{template_params("prefs.tmpl")} : ""),
|
||||
stylesheet => styleurl(),
|
||||
stylesheet => baseurl()."style.css",
|
||||
);
|
||||
my @buttons=("Save Preferences", "Logout", "Cancel");
|
||||
|
||||
|
|
@ -394,8 +393,7 @@ sub cgi_editpage ($$) { #{{{
|
|||
$form->tmpl_param("indexlink", indexlink());
|
||||
$form->tmpl_param("helponformattinglink",
|
||||
htmllink("", "", "HelpOnFormatting", 1));
|
||||
$form->tmpl_param("styleurl", styleurl());
|
||||
$form->tmpl_param("baseurl", "$config{url}/");
|
||||
$form->tmpl_param("baseurl", baseurl());
|
||||
if (! $form->submitted) {
|
||||
$form->field(name => "rcsinfo", value => rcs_prepedit($file),
|
||||
force => 1);
|
||||
|
|
@ -414,7 +412,7 @@ sub cgi_editpage ($$) { #{{{
|
|||
$form->field(name => "comments",
|
||||
value => $comments, force => 1);
|
||||
$form->tmpl_param("page_preview",
|
||||
htmlize($type, linkify($page, $page, filter($page, $content))));
|
||||
htmlize($type, linkify($page, "", filter($page, $content))));
|
||||
}
|
||||
else {
|
||||
$form->tmpl_param("page_preview", "");
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ sub genpage ($$$) { #{{{
|
|||
content => $content,
|
||||
backlinks => [backlinks($page)],
|
||||
mtime => displaytime($mtime),
|
||||
styleurl => styleurl($page),
|
||||
baseurl => baseurl($page),
|
||||
);
|
||||
|
||||
run_hooks(pagetemplate => sub {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,14 @@
|
|||
ikiwiki (1.22) UNRELEASED; urgency=low
|
||||
|
||||
* Fixed a bug with previews of subpages having broken links to top-level
|
||||
pages.
|
||||
* Change how the stylesheet url is determined in the templates: Remove
|
||||
STYLEURL and add BASEURL to all templates (some already had it). This
|
||||
new more general variable can be used to link to other things (eg, images)
|
||||
from the template, as well as stylesheets.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Mon, 21 Aug 2006 18:16:09 -0400
|
||||
|
||||
ikiwiki (1.21) unstable; urgency=low
|
||||
|
||||
* Add a tail fin^W^Wsidebar plugin by Tuomo Valkonen.
|
||||
|
|
|
|||
|
|
@ -1,20 +1,12 @@
|
|||
Seems like there should be a page for you to post your thoughts about ikiwiki, both pro and con, anything that didn't work, ideas, or whatever. Do so here..
|
||||
Seems like there should be a page for you to post your thoughts about
|
||||
ikiwiki, both pro and con, anything that didn't work, ideas, or whatever.
|
||||
Do so here..
|
||||
|
||||
Note that for more formal bug reports or todo items, you can also edit the [[bugs]] and [[todo]] pages.
|
||||
Note that for more formal bug reports or todo items, you can also edit the
|
||||
[[bugs]] and [[todo]] pages.
|
||||
|
||||
----
|
||||
How about adding ACL? So that you can control which users are allowed to read, write certain pages. The moinmoin wiki has that, and it is something, that I think is very valuable.
|
||||
|
||||
----
|
||||
It would be interesting to have a `<TMPL_VAR BASEURL>` that would act exactly like the current `STYLEURL`, but without adding 'style.css' (`STYLEURL` could be defined in terms of `BASEURL`). This way it would be possible to have more flexible templates allowing multiple stylesheets, shortcut icons (and other images), etc.
|
||||
|
||||
sub baseurl (;$) { #{{{
|
||||
my $page=shift;
|
||||
|
||||
return "$config{url}/" if ! defined $page;
|
||||
|
||||
$page=~s/[^\/]+$//;
|
||||
$page=~s/[^\/]+\//..\//g;
|
||||
return $page;
|
||||
} #}}}
|
||||
----
|
||||
|
||||
How about adding ACL? So that you can control which users are allowed
|
||||
to read, write certain pages. The moinmoin wiki has that, and it is
|
||||
something, that I think is very valuable.
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@
|
|||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<TMPL_IF NAME="BASEURL">
|
||||
<base href="<TMPL_VAR BASEURL>" />
|
||||
</TMPL_IF>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title><TMPL_VAR FORM-TITLE></title>
|
||||
<link rel="stylesheet" href="<TMPL_VAR STYLEURL>" type="text/css" />
|
||||
<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<TMPL_IF NAME="PAGE_CONFLICT">
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@
|
|||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<TMPL_IF NAME="BASEURL">
|
||||
<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 STYLEURL>" type="text/css" />
|
||||
<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title><TMPL_VAR TITLE></title>
|
||||
<link rel="stylesheet" href="<TMPL_VAR STYLEURL>" type="text/css" />
|
||||
<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
|
||||
<TMPL_IF NAME="META">
|
||||
<TMPL_VAR META>
|
||||
</TMPL_IF>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@
|
|||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<TMPL_IF NAME="BASEURL">
|
||||
<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 STYLEURL>" type="text/css" />
|
||||
<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue