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
Replace Verisign logo with one done in Inkscape
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
edittemplate.pm
diff --git
a/IkiWiki/Plugin/edittemplate.pm
b/IkiWiki/Plugin/edittemplate.pm
index d6507201080da9915cf318d2bc63f811b4fac79a..c7f1e4fa7f7117660b5d89207a1795caec9fc6af 100644
(file)
--- a/
IkiWiki/Plugin/edittemplate.pm
+++ b/
IkiWiki/Plugin/edittemplate.pm
@@
-41,6
+41,8
@@
sub needsbuild (@) {
}
}
}
}
}
}
+
+ return $needsbuild;
}
sub preprocess (@) {
}
sub preprocess (@) {
@@
-56,11
+58,17
@@
sub preprocess (@) {
}
my $link=linkpage($params{template});
}
my $link=linkpage($params{template});
+ add_depends($params{page}, $link, deptype("presence"));
my $bestlink=bestlink($params{page}, $link);
my $bestlink=bestlink($params{page}, $link);
+ if (! length $bestlink) {
+ add_depends($params{page}, "templates/$link", deptype("presence"));
+ $link="/templates/".$link;
+ $bestlink=bestlink($params{page}, $link);
+ }
$pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
$pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
- return "" if ($params{silent} && IkiWiki::yesno($params{silent}))
;
-
add_depends($params{page}, $link, deptype("presence"))
;
+ return "" if ($params{silent} && IkiWiki::yesno($params{silent}))
&&
+
length $bestlink
;
return sprintf(gettext("edittemplate %s registered for %s"),
htmllink($params{page}, $params{destpage}, $link),
$params{match});
return sprintf(gettext("edittemplate %s registered for %s"),
htmllink($params{page}, $params{destpage}, $link),
$params{match});
@@
-99,9
+107,11
@@
sub formbuilder (@) {
my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
$form->field(name => "editcontent",
value => filltemplate($template, $page));
my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
$form->field(name => "editcontent",
value => filltemplate($template, $page));
- $form->field(name => "type",
- value => pagetype($pagesources{$template}))
+ my $type=pagetype($pagesources{$template})
if $pagesources{$template};
if $pagesources{$template};
+ $form->field(name => "type",
+ value => $type)
+ if defined $type;
return;
}
}
return;
}
}
@@
-122,10
+132,7
@@
sub filltemplate ($$) {
if ($@) {
# Indicate that the earlier preprocessor directive set
# up a template that doesn't work.
if ($@) {
# Indicate that the earlier preprocessor directive set
# up a template that doesn't work.
- return "[[!pagetemplate ".gettext("failed to process template:")." $@]]";
- }
- if (! defined $template) {
- return;
+ return "[[!edittemplate ".gettext("failed to process template:")." $@]]";
}
$template->param(name => $page);
}
$template->param(name => $page);