]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Yet another patch
authorhttp://www.cse.unsw.edu.au/~willu/ <http://www.cse.unsw.edu.au/~willu/@web>
Sat, 20 Sep 2008 02:17:28 +0000 (22:17 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 20 Sep 2008 02:17:28 +0000 (22:17 -0400)
doc/todo/Allow_edittemplate_to_set_file_type.mdwn [new file with mode: 0644]

diff --git a/doc/todo/Allow_edittemplate_to_set_file_type.mdwn b/doc/todo/Allow_edittemplate_to_set_file_type.mdwn
new file mode 100644 (file)
index 0000000..9981c53
--- /dev/null
@@ -0,0 +1,40 @@
+Below is a [[patch]] to [[plugins/edittemplate]] that does a few things:
+
+ * It defaults the type of the file to be created to the same type as the template.
+ * It adds a 'silent' parameter to the directive that stops it from printing out what what registered.
+ * It makes the description of what was registered link to the template page (which gives feedback for typos or allows template creation)
+ * It adds a colon to the standard string correcting the syntax.
+
+----
+
+    diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
+    index 98308de..c381940 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;
+                                       }
+                               }