master
Joey Hess 2008-08-25 14:21:04 -04:00
parent d6fd1f1cc8
commit 8eb65c1ef1
1 changed files with 10 additions and 9 deletions

View File

@ -21,8 +21,8 @@ sub getsetup () { #{{{
}, },
directive_description_dir => { directive_description_dir => {
type => "string", type => "string",
description => "directory in srcdir that contains PreprocessorDirective descriptions", description => "directory in srcdir that contains directive descriptions",
example => "ikiwiki/plugin", example => "ikiwiki/directive",
safe => 1, safe => 1,
rebuild => 1, rebuild => 1,
}, },
@ -34,20 +34,20 @@ my $pluginstring;
sub checkconfig () { #{{{ sub checkconfig () { #{{{
if (! defined $config{directive_description_dir}) { if (! defined $config{directive_description_dir}) {
$config{directive_description_dir} = "ikiwiki/plugin"; $config{directive_description_dir} = "ikiwiki/directive";
} }
else { else {
$config{directive_description_dir}=~s/\/+$//; $config{directive_description_dir} =~ s/\/+$//;
} }
@earlylist = sort( keys %{ $IkiWiki::hooks{preprocess} } ); @earlylist = sort keys %{$IkiWiki::hooks{preprocess}};
} #}}} } #}}}
sub needsbuild (@) { #{{{ sub needsbuild (@) { #{{{
my $needsbuild=shift; my $needsbuild=shift;
@fulllist = sort( keys %{ $IkiWiki::hooks{preprocess} } ); @fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
$pluginstring = join (' ', @earlylist) . " : ". join (' ', @fulllist); $pluginstring = join(' ', @earlylist) . " : " . join(' ', @fulllist);
foreach my $page (keys %pagestate) { foreach my $page (keys %pagestate) {
if (exists $pagestate{$page}{listdirectives}{shown}) { if (exists $pagestate{$page}{listdirectives}{shown}) {
@ -83,8 +83,9 @@ sub preprocess (@) { #{{{
foreach my $plugin (@pluginlist) { foreach my $plugin (@pluginlist) {
$result .= '<li class="listdirectives">'; $result .= '<li class="listdirectives">';
$result .= htmllink($params{page}, $params{destpage}, my $link=IkiWiki::linkpage($config{directive_description_dir}."/".$plugin);
IkiWiki::linkpage($config{directive_description_dir}."/".$plugin)); add_depends($params{page}, $link);
$result .= htmllink($params{page}, $params{destpage}, $link);
$result .= '</li>'; $result .= '</li>';
} }