summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2007-12-19 16:44:33 -0500
committerJoey Hess <joey@kitenet.net>2007-12-19 16:44:33 -0500
commitb30fed47ea20c4b04c1cf9c68b6d69cfa0612c3a (patch)
tree004adf7aedd77e70b138d4003bc5841058cb8e95
parent300e69bbbd22e512f2473286893a413f215e1921 (diff)
* Improved parentlinks special case for index pages.
-rw-r--r--IkiWiki/Render.pm2
-rw-r--r--debian/changelog6
-rw-r--r--doc/todo/toplevel_index.mdwn9
3 files changed, 15 insertions, 2 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 047ab8212..4fefadf09 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -55,8 +55,8 @@ sub parentlinks ($) { #{{{
my $path="";
my $title=$config{wikiname};
- return if $page eq 'index'; # toplevel
foreach my $dir (split("/", $page)) {
+ next if $dir eq 'index';
push @ret, { url => urlto($path, $page), page => $title };
$path.="/".$dir;
$title=pagetitle($dir);
diff --git a/debian/changelog b/debian/changelog
index 65f5838ac..75462b6f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.17) UNRELEASED; urgency=low
+
+ * Improved parentlinks special case for index pages.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 19 Dec 2007 16:39:07 -0500
+
ikiwiki (2.16) unstable; urgency=low
* Major basewiki reorganisation. Most pages moved into ikiwiki/ subdirectory
diff --git a/doc/todo/toplevel_index.mdwn b/doc/todo/toplevel_index.mdwn
index 5adbaa7eb..77e315811 100644
--- a/doc/todo/toplevel_index.mdwn
+++ b/doc/todo/toplevel_index.mdwn
@@ -2,6 +2,11 @@ Some inconsistences around the toplevel [[index]] page:
* [[ikiwiki]] is a separate page; links to [[ikiwiki]] should better go to
the [[index]] though.
+
+ > At least for this wiki, I turned out to have a use for [[ikiwiki]]
+ > pointing to a different page, though the general point might still
+ > stand.
+
* The toplevel [[ikiwiki/Discussion]] page has some weird parentlinks
behavior. This could be special cased around with the following patch.
However, I'm unsure if I like the idea of more special cases around this.
@@ -21,10 +26,12 @@ Here is a patch:
if (! $skip) {
$path.="../";
+ > Came up with a better patch for this, [[done]] --[[Joey]]
+
---
> I would like to suggest another tack, namely a bigger, better special case.
> The basic idea is that all indices of the form foo/bar/index get the wiki path foo/bar.
> You could do this today using [[todo/index.html_allowed]], except that the toplevel
> page "index" becomes "", which causes all sorts of chaos. The discussion page would
-> become /discussion, and the weird parentlinks behavior would go away. --Ethan \ No newline at end of file
+> become /discussion, and the weird parentlinks behavior would go away. --Ethan