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

move plugin toggles to before config setting again

master
Joey Hess 2008-08-03 16:58:16 -04:00
parent b7d6a49be4
commit 1a37848346
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
IkiWiki/Plugin/websetup.pm
View File

@ -82,16 +82,34 @@ sub showfields ($$$@) { #{{{
push @show, $key, \%info;
}
my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main";
my %enabledfields;
my $shownfields=0;
my $plugin_forced=defined $plugin && (! $plugininfo{safe} ||
(exists $config{websetup_force_plugins} && grep { $_ eq $plugin } @{$config{websetup_force_plugins}}));
if ($plugin_forced && ! $enabled) {
# plugin is forced disabled, so skip its configuration
@show=();
}
my %shownfields;
my %skippedfields;
my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main";
# show plugin toggle
if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) {
my $name="enable.$plugin";
$form->field(
name => $name,
label => "",
type => "checkbox",
options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ],
value => $enabled,
fieldset => $section,
);
if ($plugin_forced) {
$form->field(name => $name, disabled => 1);
}
else {
$enabledfields{$name}=[$name, \%plugininfo];
}
}
while (@show) {
my $key=shift @show;
@ -164,33 +182,21 @@ sub showfields ($$$@) { #{{{
if (! $info{safe}) {
$form->field(name => $name, disabled => 1);
$skippedfields{$name}=1;
}
else {
$shownfields{$name}=[$key, \%info];
$enabledfields{$name}=[$key, \%info];
}
$shownfields++;
}
if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) {
my $name="enable.$plugin";
$section="plugins" unless %shownfields || (%skippedfields && $config{websetup_advanced});
$form->field(
name => $name,
label => "",
type => "checkbox",
options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ],
value => $enabled,
fieldset => $section,
);
if ($plugin_forced) {
$form->field(name => $name, disabled => 1);
}
else {
$shownfields{$name}=[$name, \%plugininfo];
}
# if no fields were shown for the plugin, drop it into the
# plugins fieldset
if (defined $plugin && (! $plugin_forced || $config{websetup_advanced}) &&
! $shownfields) {
$form->field(name => "enable.$plugin", fieldset => "plugins");
}
return %shownfields;
return %enabledfields;
} #}}}
sub showform ($$) { #{{{