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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index d88ec93d36f8f46ac6578d74917cfc3b1af9905f..ab43717c6188a761ccafb8b8d4c1b16802ed59ad 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -72,6 +72,7 @@ sub parentlinks ($) { #{{{
        my $pagelink="";
        my $path="";
        my $skip=1;
        my $pagelink="";
        my $path="";
        my $skip=1;

+       return if $page eq 'index'; # toplevel

        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";
        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
                        $path.="../";


@@ -156,8 +157,6 @@ sub genpage ($$$) { #{{{
        my $content=shift;
        my $mtime=shift;
 
        my $content=shift;
        my $mtime=shift;
 

-       my $title=pagetitle(basename($page));
-       

        my $template=template("page.tmpl", blind_cache => 1);
        my $actions=0;
 
        my $template=template("page.tmpl", blind_cache => 1);
        my $actions=0;
 


@@ -186,7 +185,9 @@ sub genpage ($$$) { #{{{
        }
 
        $template->param(
        }
 
        $template->param(

-               title => $title,
+               title => $page eq 'index' 
+                       ? $config{wikiname} 
+                       : pagetitle(basename($page)),

                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,
                wikiname => $config{wikiname},
                parentlinks => [parentlinks($page)],
                content => $content,

diff --git a/debian/changelog b/debian/changelog
index 3b9227c948910d73bf3a56bd6cee167608fd6672..77d5af57145f9e27008d6e9d00918684f7e54525 100644 (file)
--- a/debian/changelog
+++ b/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
 ikiwiki (1.8) unstable; urgency=low
 
   * Fix orphans plugin to not count a link to a nonexistant page as a reason

diff --git a/doc/todo/toplevel_index.mdwn b/doc/todo/toplevel_index.mdwn
index 7f766f79cc0672b44774f7f2420988a505520e21..d972707d7df8878b07cd43725ddb4ce1be1dfda8 100644 (file)
--- a/doc/todo/toplevel_index.mdwn
+++ b/doc/todo/toplevel_index.mdwn
@@ -1,7 +1,4 @@
 Some inconsistences around the toplevel [[index]] page:
 
 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.
 * [[ikiwiki]] is a separate page; links to [[ikiwiki]] should better go to
   the [[index]] though.