From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 20 Sep 2008 20:19:09 +0000 (-0400)
Subject: edittemplate patch from Willu
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/a6fc3b411f64f18cd2aabfcd2496b3f7e275e7ef

edittemplate patch from Willu

* edittemplate: Default new page file type to the same type as the template.
  (willu)
* edittemplate: Add "silent" parameter. (Willu)
* edittemplate: Link to template, to allow creating it. (Willu)
---

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 98308de13..c381940e5 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -56,8 +56,14 @@ sub preprocess (@) { #{{{
 
 	$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 (@) { #{{{
@@ -89,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;
 					}
 				}
diff --git a/debian/changelog b/debian/changelog
index a44b89058..6019e3960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ ikiwiki (2.65) UNRELEASED; urgency=low
   * Fix reversion in use of ikiwiki -verbose -setup with a setup file that
     enables syslog. Setup output is once again output to stdout in this
     case.
+  * edittemplate: Default new page file type to the same type as the template.
+    (willu)
+  * edittemplate: Add "silent" parameter. (Willu)
+  * edittemplate: Link to template, to allow creating it. (Willu)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 17 Sep 2008 14:26:56 -0400
 
diff --git a/doc/todo/Allow_edittemplate_to_set_file_type.mdwn b/doc/todo/Allow_edittemplate_to_set_file_type.mdwn
index 9981c530b..54fff6a19 100644
--- a/doc/todo/Allow_edittemplate_to_set_file_type.mdwn
+++ b/doc/todo/Allow_edittemplate_to_set_file_type.mdwn
@@ -38,3 +38,6 @@ Below is a [[patch]] to [[plugins/edittemplate]] that does a few things:
      						return;
      					}
      				}
+
+
+[[done]]