Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index e536f4e23370773aebd296e290d0c84b2ded83ae..d27df5ca894b3aacf77fb441901fb5e47cf359b9 100644 (file)
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -3,25 +3,26 @@ package IkiWiki::Plugin::progress;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my $percentage_pattern = qr/[0-9]+\%?/; # pattern to validate percentages
 
 
 my $percentage_pattern = qr/[0-9]+\%?/; # pattern to validate percentages
 

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

        hook(type => "getsetup", id => "progress", call => \&getsetup);
        hook(type => "preprocess", id => "progress", call => \&preprocess);
        hook(type => "format",     id => "progress", call => \&format);
        hook(type => "getsetup", id => "progress", call => \&getsetup);
        hook(type => "preprocess", id => "progress", call => \&preprocess);
        hook(type => "format",     id => "progress", call => \&format);

-} # }}}
+}

 
 

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

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

+                       section => "widget",

                },
                },

-} #}}}
+}

 
 

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

        my %params=@_;
        
        my $fill;
        my %params=@_;
        
        my $fill;


@@ -36,16 +37,12 @@ sub preprocess (@) { #{{{
                $fill.="%";
        }
        elsif (defined $params{totalpages} and defined $params{donepages}) {
                $fill.="%";
        }
        elsif (defined $params{totalpages} and defined $params{donepages}) {

-               add_depends($params{page}, $params{totalpages});
-               add_depends($params{page}, $params{donepages});
-
-               my @pages=keys %pagesources;
-               my $totalcount=0;
-               my $donecount=0;
-               foreach my $page (@pages) {
-                       $totalcount++ if pagespec_match($page, $params{totalpages}, location => $params{page});
-                       $donecount++ if pagespec_match($page, $params{donepages}, location => $params{page});
-               }
+               my $totalcount=pagespec_match_list(
+                       $params{page}, $params{totalpages},
+                       deptype => deptype("presence"));
+               my $donecount=pagespec_match_list(
+                       $params{page}, $params{donepages},
+                       deptype => deptype("presence"));

                
                if ($totalcount == 0) {
                        $fill = "100%";
                
                if ($totalcount == 0) {
                        $fill = "100%";


@@ -64,9 +61,9 @@ sub preprocess (@) { #{{{
   <div class="progress-done" style="width: $fill">$fill</div>
 </div>
 EODIV
   <div class="progress-done" style="width: $fill">$fill</div>
 </div>
 EODIV

-} # }}}
+}

 
 

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

        my %params = @_;
 
        # If HTMLScrubber has removed the style attribute, then bring it back
        my %params = @_;
 
        # If HTMLScrubber has removed the style attribute, then bring it back


@@ -74,6 +71,6 @@ sub format(@) { #{{{
        $params{content} =~ s!<div class="progress-done">($percentage_pattern)</div>!<div class="progress-done" style="width: $1">$1</div>!g;
 
        return $params{content};    
        $params{content} =~ s!<div class="progress-done">($percentage_pattern)</div>!<div class="progress-done" style="width: $1">$1</div>!g;
 
        return $params{content};    

-} #}}}
+}

 
 1
 
 1