Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index fc8927ccb6ca4dca305b013077c1bb8a34cb3561..835e253886d67e2223bab034643c4823fa8d23bb 100644 (file)
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -4,21 +4,22 @@ package IkiWiki::Plugin::listdirectives;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        add_underlay("directives");
        hook(type => "getsetup", id => "listdirectives", call => \&getsetup);
        hook(type => "checkconfig", id => "listdirectives", call => \&checkconfig);
        hook(type => "needsbuild", id => "listdirectives", call => \&needsbuild);
        hook(type => "preprocess", id => "listdirectives", call => \&preprocess);
        add_underlay("directives");
        hook(type => "getsetup", id => "listdirectives", call => \&getsetup);
        hook(type => "checkconfig", id => "listdirectives", call => \&checkconfig);
        hook(type => "needsbuild", id => "listdirectives", call => \&needsbuild);
        hook(type => "preprocess", id => "listdirectives", call => \&preprocess);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
                        rebuild => undef,
        return
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
                directive_description_dir => {
                        type => "string",
                },
                directive_description_dir => {
                        type => "string",


@@ -27,28 +28,27 @@ sub getsetup () { #{{{
                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },

-} #}}}
+}

 
 my @fulllist;
 
 my @fulllist;

-my @earlylist;
+my @shortlist;

 my $pluginstring;
 
 my $pluginstring;
 

-sub checkconfig () { #{{{
+sub checkconfig () {

        if (! defined $config{directive_description_dir}) {
                $config{directive_description_dir} = "ikiwiki/directive";
        }
        else {
                $config{directive_description_dir} =~ s/\/+$//;
        }
        if (! defined $config{directive_description_dir}) {
                $config{directive_description_dir} = "ikiwiki/directive";
        }
        else {
                $config{directive_description_dir} =~ s/\/+$//;
        }

+}

 
 

-       @earlylist = sort keys %{$IkiWiki::hooks{preprocess}};
-} #}}}
-
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {

        my $needsbuild=shift;
 
        my $needsbuild=shift;
 

-       @fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
-       $pluginstring = join(' ', @earlylist) . " : " . join(' ', @fulllist);
+       @fulllist = grep { ! /^_/ } sort keys %{$IkiWiki::hooks{preprocess}};
+       @shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
+       $pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);

 
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{listdirectives}{shown}) {
 
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{listdirectives}{shown}) {


@@ -64,9 +64,11 @@ sub needsbuild (@) { #{{{
                        }
                }
        }
                        }
                }
        }

-} # }}}

 
 

-sub preprocess (@) { #{{{
+       return $needsbuild;
+}
+
+sub preprocess (@) {

        my %params=@_;
        
        $pagestate{$params{destpage}}{listdirectives}{shown}=$pluginstring;
        my %params=@_;
        
        $pagestate{$params{destpage}}{listdirectives}{shown}=$pluginstring;


@@ -77,7 +79,7 @@ sub preprocess (@) { #{{{
                @pluginlist = @fulllist;
        }
        else {
                @pluginlist = @fulllist;
        }
        else {

-               @pluginlist = @earlylist;
+               @pluginlist = @shortlist;

        }
        
        my $result = '<ul class="listdirectives">';
        }
        
        my $result = '<ul class="listdirectives">';


@@ -85,7 +87,7 @@ sub preprocess (@) { #{{{
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';
                my $link=linkpage($config{directive_description_dir}."/".$plugin);
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';
                my $link=linkpage($config{directive_description_dir}."/".$plugin);

-               add_depends($params{page}, $link);
+               add_depends($params{page}, $link, deptype("presence"));

                $result .= htmllink($params{page}, $params{destpage}, $link);
                $result .= '</li>';
        }
                $result .= htmllink($params{page}, $params{destpage}, $link);
                $result .= '</li>';
        }


@@ -93,6 +95,6 @@ sub preprocess (@) { #{{{
        $result .= "</ul>";
 
        return $result;
        $result .= "</ul>";
 
        return $result;

-} # }}}
+}

 
 1
 
 1