* Add a linkmap plugin (requires graphviz).

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2cc17e32568037b27bec822fa926b0bfa70a586c..6661ed2153cb25e3df7f4c85562a51b6bd7566c8 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -10,6 +10,8 @@ use URI;
 sub import { #{{{
        IkiWiki::hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
 sub import { #{{{
        IkiWiki::hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);

+       IkiWiki::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.
        # 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.


@@ -22,7 +24,7 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
 package IkiWiki;
 
 my %toping;

-my @processing_inline;
+my %rsslinks;

 
 sub yesno ($) { #{{{
        my $val=shift;
 
 sub yesno ($) { #{{{
        my $val=shift;


@@ -32,10 +34,6 @@ sub yesno ($) { #{{{
 sub preprocess_inline (@) { #{{{
        my %params=@_;
        
 sub preprocess_inline (@) { #{{{
        my %params=@_;
        

-       # Avoid nested inlines, to avoid loops etc.
-       return "" if grep { $_ eq $params{page} } @processing_inline;
-       push @processing_inline, $params{page};
-

        if (! exists $params{pages}) {
                return "";
        }
        if (! exists $params{pages}) {
                return "";
        }


@@ -45,6 +43,13 @@ sub preprocess_inline (@) { #{{{
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }

+       my $desc;
+       if (exists $params{description}) {
+               $desc = $params{description} 
+       } else {
+               $desc = $config{wikiname};
+       }
+       my $actions=yesno($params{actions});

 
        my @list;
        foreach my $page (keys %pagesources) {
 
        my @list;
        foreach my $page (keys %pagesources) {


@@ -60,22 +65,23 @@ sub preprocess_inline (@) { #{{{
 
        add_depends($params{page}, $params{pages});
 
 
        add_depends($params{page}, $params{pages});
 

+       my $rssurl=rsspage(basename($params{page}));

        my $ret="";
        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}) {
        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);
                }
                $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;
        }
        
                $ret.=$linktemplate->output;
        }
        


@@ -86,19 +92,36 @@ sub preprocess_inline (@) { #{{{
        
        foreach my $page (@list) {
                if (! $raw) {
        
        foreach my $page (@list) {
                if (! $raw) {

+                       # Get the content before populating the template,
+                       # since getting the content uses the same template
+                       # if inlines are nested.
+                       # TODO: if $archive=1, the only reason to do this
+                       # is to let the meta plugin get page title info; so stop
+                       # calling this next line then once the meta plugin can
+                       # store that accross runs (also tags plugin).
+                       my $content=get_inline_content($page, $params{destpage});

                        # Don't use htmllink because this way the title is separate
                        # and can be overridden by other plugins.
                        my $link=htmlpage(bestlink($params{page}, $page));
                        # Don't use htmllink because this way the title is separate
                        # and can be overridden by other plugins.
                        my $link=htmlpage(bestlink($params{page}, $page));

-                       $link=abs2rel($link, dirname($params{page}));
+                       $link=abs2rel($link, dirname($params{destpage}));

                        $template->param(pageurl => $link);
                        $template->param(title => pagetitle(basename($page)));
                        $template->param(pageurl => $link);
                        $template->param(title => pagetitle(basename($page)));

-                       # TODO: if $archive=1, the only reason to do this
-                       # is to let the meta plugin get page title info; so stop
-                       # calling this next line then once the meta plugin can
-                       # store that accross runs (also tags plugin).
-                       $template->param(content => get_inline_content($page, $params{page}));
+                       $template->param(content => $content);

                        $template->param(ctime => displaytime($pagectime{$page}));
 
                        $template->param(ctime => displaytime($pagectime{$page}));
 

+                       if ($actions) {
+                               my $file = $pagesources{$page};
+                               my $type = pagetype($file);
+                               if ($config{discussion}) {
+                                       $template->param(have_actions => 1);
+                                       $template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+                               }
+                               if (length $config{cgiurl} && defined $type) {
+                                       $template->param(have_actions => 1);
+                                       $template->param(editurl => cgiurl(do => "edit", page => $page));
+                               }
+                       }
+

                        run_hooks(pagetemplate => sub {
                                shift->(page => $page, destpage => $params{page},
                                        template => $template,);
                        run_hooks(pagetemplate => sub {
                                shift->(page => $page, destpage => $params{page},
                                        template => $template,);


@@ -112,8 +135,8 @@ sub preprocess_inline (@) { #{{{
                        my $type=pagetype($file);
                        if (defined $type) {
                                $ret.="\n".
                        my $type=pagetype($file);
                        if (defined $type) {
                                $ret.="\n".

-                                     preprocess($page, $params{page},

                                      linkify($page, $params{page},
                                      linkify($page, $params{page},

+                                     preprocess($page, $params{page},

                                      filter($page,
                                      readfile(srcfile($file)))));
                        }
                                      filter($page,
                                      readfile(srcfile($file)))));
                        }


@@ -125,14 +148,23 @@ sub preprocess_inline (@) { #{{{
        # only supports listing one file per page.
        if ($config{rss} && $rss) {
                writefile(rsspage($params{page}), $config{destdir},
        # only supports listing one file per page.
        if ($config{rss} && $rss) {
                writefile(rsspage($params{page}), $config{destdir},

-                       genrss($params{page}, @list));
+                       genrss($desc, $params{page}, @list));

                $toping{$params{page}}=1 unless $config{rebuild};
                $toping{$params{page}}=1 unless $config{rebuild};

+               $rsslinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};

        }
        
        }
        

-       pop @processing_inline;

        return $ret;
 } #}}}
 
        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;
 sub get_inline_content ($$) { #{{{
        my $page=shift;
        my $destpage=shift;


@@ -140,9 +172,9 @@ sub get_inline_content ($$) { #{{{
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if (defined $type) {

-               return htmlize($type,
-                      preprocess($page, $destpage,
+               return htmlize($page, $type,

                       linkify($page, $destpage,
                       linkify($page, $destpage,

+                      preprocess($page, $destpage,

                       filter($page,
                       readfile(srcfile($file))))));
        }
                       filter($page,
                       readfile(srcfile($file))))));
        }


@@ -180,11 +212,12 @@ sub rsspage ($) { #{{{
        return $page.".rss";
 } #}}}
 
        return $page.".rss";
 } #}}}
 

-sub genrss ($@) { #{{{
+sub genrss ($$@) { #{{{
+       my $desc=shift;

        my $page=shift;
        my @pages=@_;
        
        my $page=shift;
        my @pages=@_;
        

-       my $url=URI->new(encode_utf8("$config{url}/".htmlpage($page)));
+       my $url=URI->new(encode_utf8($config{url}."/".htmlpage($page)));

        
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
        my $content="";
        
        my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
        my $content="";


@@ -215,6 +248,7 @@ sub genrss ($@) { #{{{
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,

+               rssdesc => $desc,

        );
        run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,
        );
        run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,