urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
master
Joey Hess 2008-09-20 16:19:09 -04:00
parent c51b304d90
commit a6fc3b411f
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
IkiWiki/Plugin/edittemplate.pm
View File

@ -56,8 +56,14 @@ sub preprocess (@) { #{{{
$pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template}; $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
return sprintf(gettext("edittemplate %s registered for %s"), return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
$params{template}, $params{match});
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 (@) { #{{{ sub formbuilder (@) { #{{{
@ -89,6 +95,9 @@ sub formbuilder (@) { #{{{
if (pagespec_match($p, $pagespec, location => $registering_page)) { if (pagespec_match($p, $pagespec, location => $registering_page)) {
$form->field(name => "editcontent", $form->field(name => "editcontent",
value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page)); 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; return;
} }
} }

4
debian/changelog vendored
View File

@ -10,6 +10,10 @@ ikiwiki (2.65) UNRELEASED; urgency=low
* Fix reversion in use of ikiwiki -verbose -setup with a setup file that * Fix reversion in use of ikiwiki -verbose -setup with a setup file that
enables syslog. Setup output is once again output to stdout in this enables syslog. Setup output is once again output to stdout in this
case. case.
* 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)
-- Joey Hess <joeyh@debian.org> Wed, 17 Sep 2008 14:26:56 -0400 -- Joey Hess <joeyh@debian.org> Wed, 17 Sep 2008 14:26:56 -0400

3
doc/todo/Allow_edittemplate_to_set_file_type.mdwn
View File

@ -38,3 +38,6 @@ Below is a [[patch]] to [[plugins/edittemplate]] that does a few things:
return; return;
} }
} }
[[done]]