X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/cddc335b2bd98a302b261200c12d61b05476d727..a6fc3b411f64f18cd2aabfcd2496b3f7e275e7ef:/IkiWiki/Plugin/edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index b7651ce02..c381940e5 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -8,6 +8,8 @@ use HTML::Template;
 use Encode;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "edittemplate",
+		call => \&getsetup);
 	hook(type => "needsbuild", id => "edittemplate",
 		call => \&needsbuild);
 	hook(type => "preprocess", id => "edittemplate",
@@ -16,6 +18,14 @@ sub import { #{{{
 		call => \&formbuilder);
 } #}}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
 sub needsbuild (@) { #{{{
 	my $needsbuild=shift;
 
@@ -38,23 +48,31 @@ sub preprocess (@) { #{{{
 	return "" if $params{page} ne $params{destpage};
 
 	if (! exists $params{template} || ! length($params{template})) {
-		return return "[[meta ".gettext("template not specified")."]]";
+		error gettext("template not specified")
 	}
 	if (! exists $params{match} || ! length($params{match})) {
-		return return "[[meta ".gettext("match not specified")."]]";
+		error gettext("match not specified")
 	}
 
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
 
-	return sprintf(gettext("edittemplate %s registered for %s"),
-		$params{template}, $params{match});
+	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
+
+	my $link=IkiWiki::linkpage($params{template});
+	add_depends($params{page}, $link);
+	my $linkHTML = htmllink($params{page}, $params{destpage}, $link);
+
+	return sprintf(gettext("edittemplate: %s registered for %s"),
+		$linkHTML, $params{match});
 } # }}}
 
 sub formbuilder (@) { #{{{
 	my %params=@_;
 	my $form=$params{form};
 
-	return if $form->field("do") ne "create";
+	return if $form->field("do") ne "create" ||
+		length $form->field("editcontent");
+	
 	my $page=$form->field("page");
 	
 	# The tricky bit here is that $page is probably just the base
@@ -77,6 +95,9 @@ sub formbuilder (@) { #{{{
 					if (pagespec_match($p, $pagespec, location => $registering_page)) {
 						$form->field(name => "editcontent",
 							 value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
+						$form->field(name => "type",
+							 value => pagetype($pagesources{$pagestate{$registering_page}{edittemplate}{$pagespec}}))
+								if $pagesources{$pagestate{$registering_page}{edittemplate}{$pagespec}};
 						return;
 					}
 				}
@@ -108,7 +129,9 @@ sub filltemplate ($$) { #{{{
 		);
 	};
 	if ($@) {
-		return "[[pagetemplate ".gettext("failed to process")." $@]]";
+		# Indicate that the earlier preprocessor directive set 
+		# up a template that doesn't work.
+		return "[[!pagetemplate ".gettext("failed to process")." $@]]";
 	}
 
 	$template->param(name => $page);