Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / IkiWiki / Plugin / parentlinks.pm

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index eb8bfa83b38076ff7b1dd833a5d2f8a92b6a2981..a8b3641e922a43e51a5d295ce64c6ad042890726 100644 (file)
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -1,17 +1,25 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-# -*- cperl-indent-level: 8; -*-
-# Ikiwiki pedigree plugin.
-package IkiWiki::Plugin::pedigree;
+# Ikiwiki parentlinks plugin.
+package IkiWiki::Plugin::parentlinks;

 
 use warnings;
 use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 
 use warnings;
 use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{

-       hook(type => "pagetemplate", id => "pedigree", call => \&pagetemplate);
+       hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);
+       hook(type => "pagetemplate", id => "parentlinks", call => \&pagetemplate);

 } # }}}
 
 } # }}}
 

-sub pedigree ($) { #{{{
+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+
+sub parentlinks ($) { #{{{

        my $page=shift;
 
        my @ret;
        my $page=shift;
 
        my @ret;


@@ -28,15 +36,15 @@ sub pedigree ($) { #{{{
                $depth=$i;
                $height=($pagedepth - $depth);
                push @ret, {
                $depth=$i;
                $height=($pagedepth - $depth);
                push @ret, {

-                           url => urlto($path, $page),
-                           page => $title,
-                           depth => $depth,
-                           height => $height,
-                           "depth_$depth" => 1,
-                           "height_$height" => 1,
-                          };
+                       url => urlto($path, $page),
+                       page => $title,
+                       depth => $depth,
+                       height => $height,
+                       "depth_$depth" => 1,
+                       "height_$height" => 1,
+               };

                $path.="/".$dir;
                $path.="/".$dir;

-               $title=IkiWiki::pagetitle($dir);
+               $title=pagetitle($dir);

                $i++;
        }
        return @ret;
                $i++;
        }
        return @ret;


@@ -47,8 +55,8 @@ sub pagetemplate (@) { #{{{
         my $page=$params{page};
         my $template=$params{template};
 
         my $page=$params{page};
         my $template=$params{template};
 

-       if ($template->query(name => "pedigree")) {
-               $template->param(pedigree => [pedigree($page)]);
+       if ($template->query(name => "parentlinks")) {
+               $template->param(parentlinks => [parentlinks($page)]);

        }
 } # }}}
 
        }
 } # }}}