add separate template variable for tag page and sanitize displayed tag name

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

diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm
index 280b19db0ae71e7029c940b15f0eade8c355ccad..3801a6ec2417d225f3cf541a505ff79adedec8ef 100644 (file)
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -4,14 +4,12 @@ package IkiWiki::Plugin::otl;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use open qw{:utf8 :std};
 
 sub import {
        hook(type => "getsetup", id => "otl", call => \&getsetup);
 use open qw{:utf8 :std};
 
 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 => "htmlize", id => "otl", call => \&htmlize);

-

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -19,25 +17,20 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 1, # format plugin
                plugin => {
                        safe => 1,
                        rebuild => 1, # format plugin

+                       section => "format",

                },
 }
 
                },
 }
 

-sub filter (@) {
+sub htmlize (@) {

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

-        
-       # Munge up check boxes to look a little bit better. This is a hack.
+       
+       # Munge up check boxes to look a little bit better.

        my $checked=htmllink($params{page}, $params{page},
                "smileys/star_on.png", linktext => "[X]");
        my $unchecked=htmllink($params{page}, $params{page},
                "smileys/star_off.png", linktext => "[_]");
        $params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
        $params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg;
        my $checked=htmllink($params{page}, $params{page},
                "smileys/star_on.png", linktext => "[X]");
        my $unchecked=htmllink($params{page}, $params{page},
                "smileys/star_off.png", linktext => "[_]");
        $params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
        $params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg;

-        
-       return $params{content};
-}
-
-sub htmlize (@) {
-       my %params=@_;

 
        # Can't use open2 since otl2html doesn't play nice with buffering.
        # Instead, fork off a child process that will run otl2html and feed
 
        # Can't use open2 since otl2html doesn't play nice with buffering.
        # Instead, fork off a child process that will run otl2html and feed