X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c6ee9cbf454bd8e2b557487015ec3e45a9050153..efecdae0914773b224b76a4247e1aaf3fd24ee0e:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2cc17e325..79e64beac 100644
--- 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,7 +25,7 @@ sub import { #{{{
 package IkiWiki;
 
 my %toping;
-my @processing_inline;
+my %rsslinks;
 
 sub yesno ($) { #{{{
 	my $val=shift;
@@ -32,10 +35,6 @@ sub yesno ($) { #{{{
 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 "";
 	}
@@ -45,6 +44,13 @@ sub preprocess_inline (@) { #{{{
 	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) {
@@ -60,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;
 	}
 	
@@ -86,19 +93,36 @@ sub preprocess_inline (@) { #{{{
 	
 	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));
-			$link=abs2rel($link, dirname($params{page}));
+			$link=abs2rel($link, dirname($params{destpage}));
 			$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}));
 
+			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,);
@@ -112,8 +136,8 @@ sub preprocess_inline (@) { #{{{
 			my $type=pagetype($file);
 			if (defined $type) {
 				$ret.="\n".
-				      preprocess($page, $params{page},
 				      linkify($page, $params{page},
+				      preprocess($page, $params{page},
 				      filter($page,
 				      readfile(srcfile($file)))));
 			}
@@ -125,14 +149,23 @@ sub preprocess_inline (@) { #{{{
 	# 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};
+		$rsslinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
 	}
 	
-	pop @processing_inline;
 	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;
@@ -140,9 +173,9 @@ sub get_inline_content ($$) { #{{{
 	my $file=$pagesources{$page};
 	my $type=pagetype($file);
 	if (defined $type) {
-		return htmlize($type,
-		       preprocess($page, $destpage,
+		return htmlize($page, $type,
 		       linkify($page, $destpage,
+		       preprocess($page, $destpage,
 		       filter($page,
 		       readfile(srcfile($file))))));
 	}
@@ -180,11 +213,12 @@ sub rsspage ($) { #{{{
 	return $page.".rss";
 } #}}}
 
-sub genrss ($@) { #{{{
+sub genrss ($$@) { #{{{
+	my $desc=shift;
 	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="";
@@ -215,6 +249,7 @@ sub genrss ($@) { #{{{
 		wikiname => $config{wikiname},
 		pageurl => $url,
 		content => $content,
+		rssdesc => $desc,
 	);
 	run_hooks(pagetemplate => sub {
 		shift->(page => $page, destpage => $page,