support longname for page types in commands and rename
Also, sort the list of page types.master
parent
36dbd21be6
commit
27193a2eeb
|
@ -287,10 +287,15 @@ sub editcomment ($$) {
|
|||
else {
|
||||
$type = $config{default_pageext};
|
||||
}
|
||||
|
||||
|
||||
my @page_types;
|
||||
if (exists $IkiWiki::hooks{htmlize}) {
|
||||
@page_types = grep { ! /^_/ } keys %{$IkiWiki::hooks{htmlize}};
|
||||
foreach my $key (grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}}) {
|
||||
push @page_types, [$key, $IkiWiki::hooks{htmlize}{$key}{longname} || $key];
|
||||
}
|
||||
}
|
||||
@page_types=sort @page_types;
|
||||
|
||||
$form->field(name => 'do', type => 'hidden');
|
||||
$form->field(name => 'sid', type => 'hidden', value => $session->id,
|
||||
|
|
|
@ -280,6 +280,7 @@ sub cgi_editpage ($$) {
|
|||
push @page_types, [$key, $hooks{htmlize}{$key}{longname} || $key];
|
||||
}
|
||||
}
|
||||
@page_types=sort @page_types;
|
||||
|
||||
$form->tmpl_param("page_select", 1);
|
||||
$form->field(name => "page", type => 'select',
|
||||
|
|
|
@ -116,14 +116,16 @@ sub rename_form ($$$) {
|
|||
# insert the standard extensions
|
||||
my @page_types;
|
||||
if (exists $IkiWiki::hooks{htmlize}) {
|
||||
@page_types=grep { !/^_/ }
|
||||
keys %{$IkiWiki::hooks{htmlize}};
|
||||
foreach my $key (grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}}) {
|
||||
push @page_types, [$key, $IkiWiki::hooks{htmlize}{$key}{longname} || $key];
|
||||
}
|
||||
}
|
||||
@page_types=sort @page_types;
|
||||
|
||||
# make sure the current extension is in the list
|
||||
my ($ext) = $pagesources{$page}=~/\.([^.]+)$/;
|
||||
if (! $IkiWiki::hooks{htmlize}{$ext}) {
|
||||
unshift(@page_types, $ext);
|
||||
unshift(@page_types, [$ext, $ext]);
|
||||
}
|
||||
|
||||
$f->field(name => "type", type => 'select',
|
||||
|
|
Loading…
Reference in New Issue