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

Merge commit 'remotes/jmtd/friendly_markup_names'

master
Joey Hess 2009-05-16 10:37:15 -04:00
parent d96bedef6b eba9b862b2
commit 251fe8dae6
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IkiWiki/Plugin/editpage.pm
View File

@ -276,8 +276,9 @@ sub cgi_editpage ($$) {
my @page_types;
if (exists $hooks{htmlize}) {
@page_types=grep { !/^_/ }
keys %{$hooks{htmlize}};
foreach my $key (grep { !/^_/ } keys %{$hooks{htmlize}}) {
push @page_types, [$key, $hooks{htmlize}{$key}{longname} || $key];
}
}
$form->tmpl_param("page_select", 1);

2
IkiWiki/Plugin/mdwn.pm
View File

@ -8,7 +8,7 @@ use IkiWiki 3.00;
sub import {
hook(type => "getsetup", id => "mdwn", call => \&getsetup);
hook(type => "htmlize", id => "mdwn", call => \&htmlize);
hook(type => "htmlize", id => "mdwn", call => \&htmlize, longname => "Markdown");
}
sub getsetup () {

2
IkiWiki/Plugin/textile.pm
View File

@ -11,7 +11,7 @@ use Encode;
sub import {
hook(type => "getsetup", id => "textile", call => \&getsetup);
hook(type => "htmlize", id => "txtl", call => \&htmlize);
hook(type => "htmlize", id => "txtl", call => \&htmlize, longname => "Textile");
}
sub getsetup () {

3
doc/plugins/write.mdwn
View File

@ -198,6 +198,9 @@ value, then the id parameter specifies not a filename extension, but
a whole filename that can be htmlized. This is useful for files
like `Makefile` that have no extension.
If `hook` is passed an optional "longname" parameter, this value is used
when prompting a user to choose a page type on the edit page form.
### pagetemplate
hook(type => "pagetemplate", id => "foo", call => \&pagetemplate);