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

ui improvements

master
Joey Hess 2008-08-03 16:46:38 -04:00
parent aacec52a07
commit b7d6a49be4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IkiWiki/Plugin/websetup.pm
View File

@ -90,6 +90,7 @@ sub showfields ($$$@) { #{{{
} }
my %shownfields; my %shownfields;
my %skippedfields;
my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main"; my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main";
while (@show) { while (@show) {
@ -163,6 +164,7 @@ sub showfields ($$$@) { #{{{
if (! $info{safe}) { if (! $info{safe}) {
$form->field(name => $name, disabled => 1); $form->field(name => $name, disabled => 1);
$skippedfields{$name}=1;
} }
else { else {
$shownfields{$name}=[$key, \%info]; $shownfields{$name}=[$key, \%info];
@ -171,7 +173,7 @@ sub showfields ($$$@) { #{{{
if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) { if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) {
my $name="enable.$plugin"; my $name="enable.$plugin";
$section="plugins" unless %shownfields; $section="plugins" unless %shownfields || (%skippedfields && $config{websetup_advanced});
$form->field( $form->field(
name => $name, name => $name,
label => "", label => "",
@ -221,22 +223,22 @@ sub showform ($$) { #{{{
stylesheet => IkiWiki::baseurl()."style.css", stylesheet => IkiWiki::baseurl()."style.css",
); );
if ($form->submitted eq 'Basic') { if ($form->submitted eq 'Basic Mode') {
$form->field(name => "showadvanced", type => "hidden", $form->field(name => "showadvanced", type => "hidden",
value => 0, force => 1); value => 0, force => 1);
} }
elsif ($form->submitted eq 'Advanced') { elsif ($form->submitted eq 'Advanced Mode') {
$form->field(name => "showadvanced", type => "hidden", $form->field(name => "showadvanced", type => "hidden",
value => 1, force => 1); value => 1, force => 1);
} }
my $advancedtoggle; my $advancedtoggle;
if ($form->field("showadvanced")) { if ($form->field("showadvanced")) {
$config{websetup_advanced}=1; $config{websetup_advanced}=1;
$advancedtoggle="Basic"; $advancedtoggle="Basic Mode";
} }
else { else {
$config{websetup_advanced}=0; $config{websetup_advanced}=0;
$advancedtoggle="Advanced"; $advancedtoggle="Advanced Mode";
} }
my $buttons=["Save Setup", $advancedtoggle, "Cancel"]; my $buttons=["Save Setup", $advancedtoggle, "Cancel"];