* Improve display of parentlinks and page title of toplevel index page.

IkiWiki/Render.pm

@@ -72,6 +72,7 @@ sub parentlinks ($) { #{{{
 	my $pagelink="";
 	my $path="";
 	my $skip=1;
+	return if $page eq 'index'; # toplevel
 	foreach my $dir (reverse split("/", $page)) {
 		if (! $skip) {
 			$path.="../";
@@ -156,8 +157,6 @@ sub genpage ($$$) { #{{{
 	my $content=shift;
 	my $mtime=shift;
 
-	my $title=pagetitle(basename($page));
-	
 	my $template=template("page.tmpl", blind_cache => 1);
 	my $actions=0;
 
@@ -186,7 +185,9 @@ sub genpage ($$$) { #{{{
 	}
 
 	$template->param(
-		title => $title,
+		title => $page eq 'index' 
+			? $config{wikiname} 
+			: pagetitle(basename($page)),
 		wikiname => $config{wikiname},
 		parentlinks => [parentlinks($page)],
 		content => $content,

debian/changelog

@@ -1,3 +1,9 @@
+ikiwiki (1.9) UNRELEASED; urgency=low
+
+  * Improve display of parentlinks and page title of toplevel index page.
+
+ -- Joey Hess <joeyh@debian.org>  Tue,  4 Jul 2006 15:41:16 -0400
+
 ikiwiki (1.8) unstable; urgency=low
 
   * Fix orphans plugin to not count a link to a nonexistant page as a reason

doc/todo/toplevel_index.mdwn

@@ -1,7 +1,4 @@
 Some inconsistences around the toplevel [[index]] page:
 
-* The page's title is "index"; the linkpath looks like "ikiwiki / index".
-  IMHO it would be nicer if the title were "ikiwiki" and the linkpath was
-  just "ikiwiki" (for this wiki).
 * [[ikiwiki]] is a separate page; links to [[ikiwiki]] should better go to
   the [[index]] though.