diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-04 20:04:33 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-04 20:04:33 +0000 |
| commit | 01fc6c0a4e4f0850aa762e441ce60aeac5368693 (patch) | |
| tree | 8930054b60aafbbde8291ea43bf19e80a23bf7cd | |
| parent | 1f6ed67e69ba586cbefa75c07dcd43d63f558fee (diff) | |
| download | ikiwiki-01fc6c0a4e4f0850aa762e441ce60aeac5368693.tar ikiwiki-01fc6c0a4e4f0850aa762e441ce60aeac5368693.tar.gz | |
* Improve display of parentlinks and page title of toplevel index page.
| -rw-r--r-- | IkiWiki/Render.pm | 7 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/todo/toplevel_index.mdwn | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index d88ec93d3..ab43717c6 100644 --- a/IkiWiki/Render.pm +++ b/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, diff --git a/debian/changelog b/debian/changelog index 3b9227c94..77d5af571 100644 --- 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 diff --git a/doc/todo/toplevel_index.mdwn b/doc/todo/toplevel_index.mdwn index 7f766f79c..d972707d7 100644 --- a/doc/todo/toplevel_index.mdwn +++ b/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. |