Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
po: reorder nearly all of the module code
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
edittemplate.pm
diff --git
a/IkiWiki/Plugin/edittemplate.pm
b/IkiWiki/Plugin/edittemplate.pm
index 98308de135ba42c6efc5d574b261d51cc5f18e29..846b4e7c832c499a0755860b2c277b282a2b2f1d 100644
(file)
--- a/
IkiWiki/Plugin/edittemplate.pm
+++ b/
IkiWiki/Plugin/edittemplate.pm
@@
-54,10
+54,14
@@
sub preprocess (@) { #{{{
error gettext("match not specified")
}
error gettext("match not specified")
}
- $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
+ my $link=linkpage($params{template});
+ $pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
+ return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
+ add_depends($params{page}, $link);
return sprintf(gettext("edittemplate %s registered for %s"),
return sprintf(gettext("edittemplate %s registered for %s"),
- $params{template}, $params{match});
+ htmllink($params{page}, $params{destpage}, $link),
+ $params{match});
} # }}}
sub formbuilder (@) { #{{{
} # }}}
sub formbuilder (@) { #{{{
@@
-65,7
+69,7
@@
sub formbuilder (@) { #{{{
my $form=$params{form};
return if $form->field("do") ne "create" ||
my $form=$params{form};
return if $form->field("do") ne "create" ||
-
length $form->field("editcontent"
);
+
(defined $form->field("editcontent") && length $form->field("editcontent")
);
my $page=$form->field("page");
my $page=$form->field("page");
@@
-87,8
+91,12
@@
sub formbuilder (@) { #{{{
if (exists $pagestate{$registering_page}{edittemplate}) {
foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
if (pagespec_match($p, $pagespec, location => $registering_page)) {
if (exists $pagestate{$registering_page}{edittemplate}) {
foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
if (pagespec_match($p, $pagespec, location => $registering_page)) {
+ my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
$form->field(name => "editcontent",
$form->field(name => "editcontent",
- value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
+ value => filltemplate($template, $page));
+ $form->field(name => "type",
+ value => pagetype($pagesources{$template}))
+ if $pagesources{$template};
return;
}
}
return;
}
}