Update changelog

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

diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index 890a349b597ed2b7193ece1738436c595bd6c05b..9f16dd08296a5743084fc390ddde362e3a6a5fe9 100644 (file)
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -4,15 +4,34 @@ package IkiWiki::Plugin::parentlinks;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "parentlinks", id => "parentlinks", call => \&parentlinks);

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

-} # }}}
+       hook(type => "getsetup", id => "parentlinks", call => \&getsetup);
+}

 
 

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

        my $page=shift;
 
        my $page=shift;
 

+       if (! length $page) {
+               # dynamic page
+               return {
+                       url => IkiWiki::baseurl(undef),
+                       page => $config{wikiname},
+               };
+       }
+

        my @ret;
        my $path="";
        my $title=$config{wikiname};
        my @ret;
        my $path="";
        my $title=$config{wikiname};


@@ -27,7 +46,7 @@ sub parentlinks ($) { #{{{
                $depth=$i;
                $height=($pagedepth - $depth);
                push @ret, {
                $depth=$i;
                $height=($pagedepth - $depth);
                push @ret, {

-                       url => urlto($path, $page),
+                       url => urlto(bestlink($page, $path), $page),

                        page => $title,
                        depth => $depth,
                        height => $height,
                        page => $title,
                        depth => $depth,
                        height => $height,


@@ -35,20 +54,22 @@ sub parentlinks ($) { #{{{
                        "height_$height" => 1,
                };
                $path.="/".$dir;
                        "height_$height" => 1,
                };
                $path.="/".$dir;

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

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

-} #}}}
+}

 
 

-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {

        my %params=@_;
        my %params=@_;

-        my $page=$params{page};

         my $template=$params{template};
 
         my $template=$params{template};
 

-       if ($template->query(name => "parentlinks")) {
-               $template->param(parentlinks => [parentlinks($page)]);
+       if ($template->query(name => "parentlinks") ||
+           $template->query(name => "has_parentlinks")) {
+               my @links=parentlinks($params{page});
+               $template->param(parentlinks => \@links);
+               $template->param(has_parentlinks => (@links > 0));

        }
        }

-} # }}}
+}

 
 1
 
 1