Merge commit 'intrigeri/pedigree'

2 files changed, 55 insertions, 18 deletions

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
new file mode 100644
index 000000000..a94cd469c
--- /dev/null
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -0,0 +1,55 @@
+#!/usr/bin/perl
+# -*- cperl-indent-level: 8; -*-
+# Ikiwiki parentlinks plugin.
+package IkiWiki::Plugin::parentlinks;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+sub import { #{{{
+	hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);
+} # }}}
+
+sub parentlinks ($) { #{{{
+	my $page=shift;
+
+	my @ret;
+	my $path="";
+	my $title=$config{wikiname};
+	my $i=0;
+	my $depth=0;
+	my $height=0;
+
+	my @pagepath=(split("/", $page));
+	my $pagedepth=@pagepath;
+	foreach my $dir (@pagepath) {
+		next if $dir eq 'index';
+		$depth=$i;
+		$height=($pagedepth - $depth);
+		push @ret, {
+			    url => urlto($path, $page),
+			    page => $title,
+			    depth => $depth,
+			    height => $height,
+			    "depth_$depth" => 1,
+			    "height_$height" => 1,
+			   };
+		$path.="/".$dir;
+		$title=IkiWiki::pagetitle($dir);
+		$i++;
+	}
+	return @ret;
+} #}}}
+
+sub pagetemplate (@) { #{{{
+	my %params=@_;
+        my $page=$params{page};
+        my $template=$params{template};
+
+	if ($template->query(name => "parentlinks")) {
+		$template->param(parentlinks => [parentlinks($page)]);
+	}
+} # }}}
+
+1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 990fcaaa1..8a79119cd 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -47,23 +47,6 @@ sub backlinks ($) { #{{{
 	return @links;
 } #}}}
 
-sub parentlinks ($) { #{{{
-	my $page=shift;
-	
-	my @ret;
-	my $pagelink="";
-	my $path="";
-	my $title=$config{wikiname};
-	
-	foreach my $dir (split("/", $page)) {
-		next if $dir eq 'index';
-		push @ret, { url => urlto($path, $page), page => $title };
-		$path.="/".$dir;
-		$title=pagetitle($dir);
-	}
-	return @ret;
-} #}}}
-
 sub genpage ($$) { #{{{
 	my $page=shift;
 	my $content=shift;
@@ -121,7 +104,6 @@ sub genpage ($$) { #{{{
 			? $config{wikiname} 
 			: pagetitle(basename($page)),
 		wikiname => $config{wikiname},
-		parentlinks => [parentlinks($page)],
 		content => $content,
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,