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

* Clean up behavior with broken parentlinks.

master
joey 2006-08-21 22:45:17 +00:00
parent cf3021ef3f
commit d0295d9dc0
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Render.pm
View File

@ -74,7 +74,7 @@ sub parentlinks ($) { #{{{
foreach my $dir (reverse split("/", $page)) { foreach my $dir (reverse split("/", $page)) {
if (! $skip) { if (! $skip) {
$path.="../"; $path.="../";
unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) }; unshift @ret, { url => exists $pagesources{$dir} ? $path.htmlpage($dir) : "", page => pagetitle($dir) };
} }
else { else {
$skip=0; $skip=0;

3
debian/changelog vendored
View File

@ -6,8 +6,9 @@ ikiwiki (1.22) UNRELEASED; urgency=low
STYLEURL and add BASEURL to all templates (some already had it). This 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) new more general variable can be used to link to other things (eg, images)
from the template, as well as stylesheets. from the template, as well as stylesheets.
* Clean up behavior with broken parentlinks.
-- Joey Hess <joeyh@debian.org> Mon, 21 Aug 2006 18:16:09 -0400 -- Joey Hess <joeyh@debian.org> Mon, 21 Aug 2006 18:26:28 -0400
ikiwiki (1.21) unstable; urgency=low ikiwiki (1.21) unstable; urgency=low

2
doc/bugs/broken_parentlinks.mdwn
View File

@ -5,3 +5,5 @@ that superpages weren't mandatory.
For example, if you are in 'example/page.html', the header will be something For example, if you are in 'example/page.html', the header will be something
like 'wiki / example / page'. Now, if 'example.html' doesn't exist, you'll have like 'wiki / example / page'. Now, if 'example.html' doesn't exist, you'll have
a dead link for every subpage. a dead link for every subpage.
[[todo/done]]

4
templates/page.tmpl
View File

@ -14,7 +14,11 @@
<div class="header"> <div class="header">
<span> <span>
<TMPL_LOOP NAME="PARENTLINKS"> <TMPL_LOOP NAME="PARENTLINKS">
<TMPL_IF NAME="URL">
<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ <a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/
<TMPL_ELSE>
<TMPL_VAR NAME=PAGE>/
</TMPL_IF>
</TMPL_LOOP> </TMPL_LOOP>
<TMPL_VAR TITLE> <TMPL_VAR TITLE>
</span> </span>