From 7144eb3973ac73a5f79440f91a7c01665fb83aa4 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 14 Mar 2006 05:33:44 +0000 Subject: [PATCH] Some fixes to the parent links, I think the link to the index will be right in all cases now. --- doc/bugs.mdwn | 2 ++ doc/todo.mdwn | 9 +++++++++ ikiwiki | 5 ++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn index c9b175453..3fbdadd45 100644 --- a/doc/bugs.mdwn +++ b/doc/bugs.mdwn @@ -20,3 +20,5 @@ replaced with a link to the [[CGI]]? * [[ikiwiki]] should go to the same place as [[index]] (on this wiki). * There's no way to escape a [[WikiLink]] when discussing one on a wiki. +* Seems to be losing track of just-created pages and not adding them to the + index. diff --git a/doc/todo.mdwn b/doc/todo.mdwn index d65991542..dd69e21fb 100644 --- a/doc/todo.mdwn +++ b/doc/todo.mdwn @@ -77,4 +77,13 @@ recentchanges that goes to the diff for any listed change. Possibly add "next 100" link to it, but OTOH, you can just use svn log if you need that data.. +## setup classes + +The setup files should "use WikiWiki::Setup" and the like at the top, and +indeed could just be one big use that passes all params to the module's +importer. The module then handles running ikiwiki functions. This would +allow for different types of setup files for more than just the one +hardcoded thing there is now, and would probably be good for upgrades, +incompatible changes, etc, too. + ## [[Bugs]] diff --git a/ikiwiki b/ikiwiki index f95ea0f09..7e140bbec 100755 --- a/ikiwiki +++ b/ikiwiki @@ -307,15 +307,14 @@ sub parentlinks ($) { #{{{ my $skip=1; foreach my $dir (reverse split("/", $page)) { if (! $skip) { + $path.="../"; unshift @ret, { url => "$path$dir.html", page => $dir }; } else { $skip=0; } - $path.="../"; } - $path=~s!../!!; - unshift @ret, { url => $path , page => $config{wikiname} }; + unshift @ret, { url => length $path ? $path : ".", page => $config{wikiname} }; return @ret; } #}}} -- 2.26.2