* Work on firming up the plugin interface:

[ikiwiki.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 70d5be2353665b574752d3b23109150e0ece9340..79e64beac72a16fd5019d23eac3614ea848afbbf 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -5,15 +5,18 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use IkiWiki;
+use IkiWiki::Render; # for displaytime
 use URI;
 
 sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "inline", 
+       hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
+       hook(type => "pagetemplate", id => "inline",
+               call => \&IkiWiki::pagetemplate_inline);
        # Hook to change to do pinging since it's called late.
        # This ensures each page only pings once and prevents slow
        # pings interrupting page builds.
-       IkiWiki::hook(type => "change", id => "inline", 
+       hook(type => "change", id => "inline", 
                call => \&IkiWiki::pingurl);
 } # }}}
 
@@ -22,6 +25,7 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
+my %rsslinks;
 
 sub yesno ($) { #{{{
        my $val=shift;
@@ -62,22 +66,23 @@ sub preprocess_inline (@) { #{{{
 
        add_depends($params{page}, $params{pages});
 
+       my $rssurl=rsspage(basename($params{page}));
        my $ret="";
-       
+
        if (exists $params{rootpage} && $config{cgiurl}) {
                # Add a blog post form, with a rss link button.
                my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
                $formtemplate->param(cgiurl => $config{cgiurl});
                $formtemplate->param(rootpage => $params{rootpage});
                if ($config{rss}) {
-                       $formtemplate->param(rssurl => rsspage(basename($params{page})));
+                       $formtemplate->param(rssurl => $rssurl);
                }
                $ret.=$formtemplate->output;
        }
        elsif ($config{rss} && $rss) {
                # Add a rss link button.
                my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
-               $linktemplate->param(rssurl => rsspage(basename($params{page})));
+               $linktemplate->param(rssurl => $rssurl);
                $ret.=$linktemplate->output;
        }
        
@@ -146,11 +151,21 @@ sub preprocess_inline (@) { #{{{
                writefile(rsspage($params{page}), $config{destdir},
                        genrss($desc, $params{page}, @list));
                $toping{$params{page}}=1 unless $config{rebuild};
+               $rsslinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
        }
        
        return $ret;
 } #}}}
 
+sub pagetemplate_inline (@) { #{{{
+       my %params=@_;
+       my $page=$params{page};
+       my $template=$params{template};
+
+       $template->param(rsslink => $rsslinks{$page})
+               if exists $rsslinks{$page} && $template->query(name => "rsslink");
+} #}}}
+
 sub get_inline_content ($$) { #{{{
        my $page=shift;
        my $destpage=shift;