* Various CSS and formatting changes.

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 427c25a96d75f8ffdd760a487ad1ae704ee80364..71e71c02e4b4cb3aeccf2ec42247e9efa08dde96 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -35,6 +35,9 @@ sub preprocess_inline (@) { #{{{
        if (! exists $params{show} && $params{archive} eq "no") {
                $params{show}=10;
        }
+       if (! exists $params{rss}) {
+               $params{rss}="yes";
+       }
 
        # Avoid nested inlines, to avoid loops etc.
        if ($processing_inline) {
@@ -45,7 +48,7 @@ sub preprocess_inline (@) { #{{{
        my @list;
        foreach my $page (keys %pagesources) {
                next if $page eq $params{page};
-               if (globlist_match($page, $params{pages})) {
+               if (pagespec_match($page, $params{pages})) {
                        push @list, $page;
                }
        }
@@ -58,7 +61,7 @@ sub preprocess_inline (@) { #{{{
 
        my $ret="";
        
-       if (exists $params{rootpage}) {
+       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});
@@ -68,7 +71,7 @@ sub preprocess_inline (@) { #{{{
                }
                $ret.=$formtemplate->output;
        }
-       elsif ($config{rss}) {
+       elsif ($config{rss} && $params{rss} eq "yes") {
                # Add a rss link button.
                my $linktemplate=template("rsslink.tmpl", blind_cache => 1);
                $linktemplate->param(rssurl => rsspage(basename($params{page})));
@@ -83,20 +86,20 @@ sub preprocess_inline (@) { #{{{
        );
        
        foreach my $page (@list) {
-               $template->param(pagelink => htmllink($params{page}, $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}));
+               $template->param(pageurl => $link);
+               $template->param(title => pagetitle(basename($page)));
                $template->param(content => get_inline_content($page, $params{page}))
                        if $params{archive} eq "no";
                $template->param(ctime => displaytime($pagectime{$page}));
 
-               if (exists $hooks{pagetemplate}) {
-                       foreach my $id (keys %{$hooks{pagetemplate}}) {
-                               $hooks{pagetemplate}{$id}{call}->(
-                                       page => $page,
-                                       destpage => $params{page},
-                                       template => $template,
-                               );
-                       }
-               }
+               run_hooks(pagetemplate => sub {
+                       shift->(page => $page, destpage => $params{page},
+                               template => $template,);
+               });
 
                $ret.=$template->output;
                $template->clear_params;
@@ -105,7 +108,7 @@ sub preprocess_inline (@) { #{{{
        # TODO: should really add this to renderedfiles and call
        # check_overwrite, but currently renderedfiles
        # only supports listing one file per page.
-       if ($config{rss}) {
+       if ($config{rss} && $params{rss} eq "yes") {
                writefile(rsspage($params{page}), $config{destdir},
                        genrss($params{page}, @list));
                $toping{$params{page}}=1 unless $config{rebuild};
@@ -161,33 +164,39 @@ sub genrss ($@) { #{{{
        
        my $url="$config{url}/".htmlpage($page);
        
-       my $template=template("rsspage.tmpl", blind_cache => 1,
+       my $itemtemplate=template("rssitem.tmpl", blind_cache => 1, 
                die_on_bad_params => 0);
-       
-       my @items;
+       my $content="";
        foreach my $p (@pages) {
-               push @items, {
-                       itemtitle => pagetitle(basename($p)),
-                       itemurl => "$config{url}/$renderedfiles{$p}",
-                       itempubdate => date_822($pagectime{$p}),
-                       itemcontent => absolute_urls(get_inline_content($p, $page), $url),
-                       page => $p, # used by category adding code in tag plugin
-               } if exists $renderedfiles{$p};
+               next unless exists $renderedfiles{$p};
+
+               $itemtemplate->param(
+                       title => pagetitle(basename($p)),
+                       url => "$config{url}/$renderedfiles{$p}",
+                       permalink => "$config{url}/$renderedfiles{$p}",
+                       pubdate => date_822($pagectime{$p}),
+                       content => absolute_urls(get_inline_content($p, $page), $url),
+               );
+               run_hooks(pagetemplate => sub {
+                       shift->(page => $p, destpage => $page,
+                               template => $itemtemplate);
+               });
+
+               $content.=$itemtemplate->output;
+               $itemtemplate->clear_params;
        }
 
+       my $template=template("rsspage.tmpl", blind_cache => 1);
        $template->param(
                title => $config{wikiname},
+               wikiname => $config{wikiname},
                pageurl => $url,
-               items => \@items,
+               content => $content,
        );
-       
-       foreach my $id (keys %{$hooks{pagetemplate}}) {
-               $hooks{pagetemplate}{$id}{call}->(
-                       page => $page,
-                       destpage => $page,
-                       template => $template,
-               );
-       }
+       run_hooks(pagetemplate => sub {
+               shift->(page => $page, destpage => $page,
+                       template => $template);
+       });
        
        return $template->output;
 } #}}}