summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-09-20 16:19:09 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-09-20 16:19:09 -0400
commita6fc3b411f64f18cd2aabfcd2496b3f7e275e7ef (patch)
tree74c7966793549923a8f4094ee4dcf85aa8a6cd5c /IkiWiki/Plugin
parentc51b304d90104b4be7d3150821f44273d5be4376 (diff)
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)
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/edittemplate.pm13
1 files changed, 11 insertions, 2 deletions
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;
}
}