X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/fdaab0fdddcb332cfd9386bef385eb167ba51cb1..43ede4be2e82dd07e8689c9ef7029ed7d3adc5bb:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8ceaa95e0..c7cafee12 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -4,16 +4,19 @@ package IkiWiki::Plugin::inline;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 1.00;
+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;
@@ -55,29 +59,40 @@ sub preprocess_inline (@) { #{{{
 			push @list, $page;
 		}
 	}
-	@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+
+	if (exists $params{sort} && $params{sort} eq 'title') {
+		@list=sort @list;
+	}
+	elsif (! exists $params{sort} || $params{sort} eq 'age') {
+		@list=sort { $pagectime{$b} <=> $pagectime{$a} } @list;
+	}
+	else {
+		return "unknown sort type $params{sort}";
+	}
+
 	if ($params{show} && @list > $params{show}) {
 		@list=@list[0..$params{show} - 1];
 	}
 
 	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;
 	}
 	
@@ -99,7 +114,7 @@ sub preprocess_inline (@) { #{{{
 			# 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(content => $content);
@@ -139,18 +154,26 @@ 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} && $rss) {
+		will_render($params{page}, rsspage($params{page}));
 		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;
@@ -208,9 +231,7 @@ sub genrss ($$@) { #{{{
 	my $itemtemplate=template("rssitem.tmpl", blind_cache => 1);
 	my $content="";
 	foreach my $p (@pages) {
-		next unless exists $renderedfiles{$p};
-
-		my $u=URI->new(encode_utf8("$config{url}/$renderedfiles{$p}"));
+		my $u=URI->new(encode_utf8($config{url}."/".htmlpage($p)));
 
 		$itemtemplate->param(
 			title => pagetitle(basename($p)),