Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm
index 3f34133906fec3c181ee25aee42682305c0fe720..ef76d621549d44dd575fda54dfa1760bb5c4febd 100644 (file)
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -4,22 +4,32 @@ package IkiWiki::Plugin::otl;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;
+use open qw{:utf8 :std};

 
 sub import { #{{{
 
 sub import { #{{{

+       hook(type => "getsetup", id => "otl", call => \&getsetup);

        hook(type => "filter", id => "otl", call => \&filter);
        hook(type => "htmlize", id => "otl", call => \&htmlize);
 
 } # }}}
 
        hook(type => "filter", id => "otl", call => \&filter);
        hook(type => "htmlize", id => "otl", call => \&htmlize);
 
 } # }}}
 

+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+               },
+} #}}}
+

 sub filter (@) { #{{{
        my %params=@_;
         
        # Munge up check boxes to look a little bit better. This is a hack.
        my $checked=htmllink($params{page}, $params{page},
 sub filter (@) { #{{{
        my %params=@_;
         
        # Munge up check boxes to look a little bit better. This is a hack.
        my $checked=htmllink($params{page}, $params{page},

-               "smileys/star_on.png", 0, 0, "[X]");
+               "smileys/star_on.png", linktext => "[X]");

        my $unchecked=htmllink($params{page}, $params{page},
        my $unchecked=htmllink($params{page}, $params{page},

-               "smileys/star_off.png", 0, 0, "[_]");
+               "smileys/star_off.png", linktext => "[_]");

        $params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
        $params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg;
         
        $params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
        $params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg;