edittemplate patch from Willu

[git.ikiwiki.info.git] / IkiWiki / Plugin / edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index cdcdd074f5ff63f64ed7190c6b84b221f5a697ca..c381940e5edd4056b5622c0daeb10cab1d6423a8 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -56,15 +56,23 @@ 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 (@) { #{{{
        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
@@ -87,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;
                                        }
                                }