Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / websetup.pm

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 061ce08735d17220802e1d6855f72ab51d284cbf..dec360d68d21f903049e7f45765f0f9338c714bc 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -5,12 +5,6 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
 use strict;
 use IkiWiki 2.00;
 

-my @rcs_plugins=(qw{git svn bzr mercurial monotone tla norcs});
-
-# amazon_s3 is not something that should be enabled via the web.
-# external is not a standalone plugin.
-my @force_plugins=(qw{amazon_s3 external});
-

 sub import { #{{{
        hook(type => "getsetup", id => "websetup", call => \&getsetup);
        hook(type => "checkconfig", id => "websetup", call => \&checkconfig);
 sub import { #{{{
        hook(type => "getsetup", id => "websetup", call => \&getsetup);
        hook(type => "checkconfig", id => "websetup", call => \&checkconfig);


@@ -64,12 +58,13 @@ sub showfields ($$$@) { #{{{
        my $enabled=shift;
 
        my @show;
        my $enabled=shift;
 
        my @show;

+       my %plugininfo;

        while (@_) {
                my $key=shift;
                my %info=%{shift()};
 
                # skip internal settings
        while (@_) {
                my $key=shift;
                my %info=%{shift()};
 
                # skip internal settings

-               next if $info{type} eq "internal";
+               next if defined $info{type} && $info{type} eq "internal";

                # XXX hashes not handled yet
                next if ref $config{$key} && ref $config{$key} eq 'HASH' || ref $info{example} eq 'HASH';
                # maybe skip unsafe settings
                # XXX hashes not handled yet
                next if ref $config{$key} && ref $config{$key} eq 'HASH' || ref $info{example} eq 'HASH';
                # maybe skip unsafe settings


@@ -78,23 +73,41 @@ sub showfields ($$$@) { #{{{
                next if $info{advanced} && ! $config{websetup_advanced};
                # these are handled specially, so don't show
                next if $key eq 'add_plugins' || $key eq 'disable_plugins';
                next if $info{advanced} && ! $config{websetup_advanced};
                # these are handled specially, so don't show
                next if $key eq 'add_plugins' || $key eq 'disable_plugins';

+
+               if ($key eq 'plugin') {
+                       %plugininfo=%info;
+                       next;
+               }

                
                push @show, $key, \%info;
        }
 
                
                push @show, $key, \%info;
        }
 

-       return unless @show;
-
-       my $section=defined $plugin ? $plugin." ".gettext("plugin") : gettext("main");
-
-       my %shownfields;
-       if (defined $plugin) {
-               if (showplugintoggle($form, $plugin, $enabled, $section)) {
-                       $shownfields{"enable.$plugin"}=[$plugin];
+       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=();
+       }
+       # 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);

                }
                }

-               elsif (! $enabled) {
-                   # plugin not enabled and cannot be, so skip showing
-                   # its configuration
-                   return;
+               else {
+                       $enabledfields{$name}=[$name, \%plugininfo];

                }
        }
 
                }
        }
 


@@ -169,40 +182,21 @@ sub showfields ($$$@) { #{{{
                
                if (! $info{safe}) {
                        $form->field(name => $name, disabled => 1);
                
                if (! $info{safe}) {
                        $form->field(name => $name, disabled => 1);

-                       $form->text(gettext("Note: Disabled options cannot be configured here, but only by editing the setup file."));

                }
                else {
                }
                else {

-                       $shownfields{$name}=[$key, \%info];
+                       $enabledfields{$name}=[$key, \%info];

                }
                }

+               $shownfields++;

        }
        }

-
-       return %shownfields;
-} #}}}
-
-sub showplugintoggle ($$$$) { #{{{
-       my $form=shift;
-       my $plugin=shift;
-       my $enabled=shift;
-       my $section=shift;
-
-       if (exists $config{websetup_force_plugins} &&
-           grep { $_ eq $plugin } @{$config{websetup_force_plugins}}) {
-               return 0;
-       }
-       if (grep { $_ eq $plugin } @force_plugins, @rcs_plugins) {
-               return 0;
+       
+       # 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");

        }
 
        }
 

-       $form->field(
-               name => "enable.$plugin",
-               label => "",
-               type => "checkbox",
-               options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ],
-               value => $enabled,
-               fieldset => $section,
-       );
-
-       return 1;
+       return %enabledfields;

 } #}}}
 
 sub showform ($$) { #{{{
 } #}}}
 
 sub showform ($$) { #{{{


@@ -226,27 +220,31 @@ sub showform ($$) { #{{{
                javascript => 0,
                reset => 1,
                params => $cgi,
                javascript => 0,
                reset => 1,
                params => $cgi,

+               fieldsets => [
+                       [main => gettext("main")], 
+                       [plugins => gettext("plugins")]
+               ],

                action => $config{cgiurl},
                template => {type => 'div'},
                stylesheet => IkiWiki::baseurl()."style.css",
        );
 
                action => $config{cgiurl},
                template => {type => 'div'},
                stylesheet => IkiWiki::baseurl()."style.css",
        );
 

-       if ($form->submitted eq 'Basic') {
+       if ($form->submitted eq 'Basic Mode') {

                $form->field(name => "showadvanced", type => "hidden", 
                        value => 0, force => 1);
        }
                $form->field(name => "showadvanced", type => "hidden", 
                        value => 0, force => 1);
        }

-       elsif ($form->submitted eq 'Advanced') {
+       elsif ($form->submitted eq 'Advanced Mode') {

                $form->field(name => "showadvanced", type => "hidden", 
                        value => 1, force => 1);
        }
        my $advancedtoggle;
        if ($form->field("showadvanced")) {
                $config{websetup_advanced}=1;
                $form->field(name => "showadvanced", type => "hidden", 
                        value => 1, force => 1);
        }
        my $advancedtoggle;
        if ($form->field("showadvanced")) {
                $config{websetup_advanced}=1;

-               $advancedtoggle="Basic";
+               $advancedtoggle="Basic Mode";

        }
        else {
                $config{websetup_advanced}=0;
        }
        else {
                $config{websetup_advanced}=0;

-               $advancedtoggle="Advanced";
+               $advancedtoggle="Advanced Mode";

        }
 
        my $buttons=["Save Setup", $advancedtoggle, "Cancel"];
        }
 
        my $buttons=["Save Setup", $advancedtoggle, "Cancel"];


@@ -271,9 +269,6 @@ sub showform ($$) { #{{{
        foreach my $pair (IkiWiki::Setup::getsetup()) {
                my $plugin=$pair->[0];
                my $setup=$pair->[1];
        foreach my $pair (IkiWiki::Setup::getsetup()) {
                my $plugin=$pair->[0];
                my $setup=$pair->[1];

-               
-               # skip all rcs plugins except for the one in use
-               next if $plugin ne $config{rcs} && grep { $_ eq $plugin } @rcs_plugins;

 
                my %shown=showfields($form, $plugin, $enabled_plugins{$plugin}, @{$setup});
                if (%shown) {
 
                my %shown=showfields($form, $plugin, $enabled_plugins{$plugin}, @{$setup});
                if (%shown) {


@@ -281,13 +276,6 @@ sub showform ($$) { #{{{
                        $fields{$_}=$shown{$_} foreach keys %shown;
                }
        }
                        $fields{$_}=$shown{$_} foreach keys %shown;
                }
        }

-
-       # list all remaining plugins (with no setup options) at the end
-       foreach (sort keys %plugins) {
-               if (showplugintoggle($form, $_, $enabled_plugins{$_}, gettext("other plugins"))) {
-                       $fields{"enable.$_"}=[$_];
-               }
-       }

        
        if ($form->submitted eq "Cancel") {
                IkiWiki::redirect($cgi, $config{url});
        
        if ($form->submitted eq "Cancel") {
                IkiWiki::redirect($cgi, $config{url});