X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/af029154d6b145302f8ece0286711f61ea606877..89697f2c7a9cebc9e0c33ca1d056388b9e827eb8:/IkiWiki/Render.pm?ds=sidebyside

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 404726930..6d5ea9ee5 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -4,7 +4,6 @@ package IkiWiki;
 
 use warnings;
 use strict;
-use File::Spec;
 use IkiWiki;
 use Encode;
 
@@ -48,7 +47,7 @@ sub backlinks ($) { #{{{
 	foreach my $p (keys %links) {
 		next if bestlink($page, $p) eq $page;
 		if (grep { length $_ && bestlink($p, $_) eq $page } @{$links{$p}}) {
-			my $href=File::Spec->abs2rel(htmlpage($p), dirname($page));
+			my $href=abs2rel(htmlpage($p), dirname($page));
 			
 			# Trim common dir prefixes from both pages.
 			my $p_trimmed=$p;
@@ -73,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.="../";
@@ -157,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;
 
@@ -187,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,
@@ -222,7 +222,7 @@ sub displaytime ($) { #{{{
 	eval q{use POSIX};
 	# strftime doesn't know about encodings, so make sure
 	# its output is properly treated as utf8
-	return Encode::decode_utf8(POSIX::strftime(
+	return decode_utf8(POSIX::strftime(
 			$config{timeformat}, localtime($time)));
 } #}}}
 
@@ -310,7 +310,7 @@ sub refresh () { #{{{
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			$_ = Encode::decode_utf8($_);
+			$_=decode_utf8($_);
 			if (/$config{wiki_file_prune_regexp}/) {
 				$File::Find::prune=1;
 			}
@@ -330,7 +330,7 @@ sub refresh () { #{{{
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			$_ = Encode::decode_utf8($_);
+			$_=decode_utf8($_);
 			if (/$config{wiki_file_prune_regexp}/) {
 				$File::Find::prune=1;
 			}