Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 6a51903016830c17339f2130a964f87708ae15b0..d3cbff0d554cf11f9d6c9b3e9249293e60845ab4 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -151,7 +151,10 @@ sub showfields ($$$@) {
                my %info=%{shift @show};
 
                my $description=$info{description};
                my %info=%{shift @show};
 
                my $description=$info{description};

-               if (exists $info{link} && length $info{link}) {
+               if (exists $info{htmldescription}) {
+                       $description=$info{htmldescription};
+               }
+               elsif (exists $info{link} && length $info{link}) {

                        if ($info{link} =~ /^\w+:\/\//) {
                                $description="<a href=\"$info{link}\">$description</a>";
                        }
                        if ($info{link} =~ /^\w+:\/\//) {
                                $description="<a href=\"$info{link}\">$description</a>";
                        }


@@ -447,22 +450,22 @@ sub showform ($$) {
                        IkiWiki::saveindex();
                        IkiWiki::unlockwiki();
 
                        IkiWiki::saveindex();
                        IkiWiki::unlockwiki();
 

-                       # Print the top part of a standard misctemplate,
+                       # Print the top part of a standard cgitemplate,

                        # then show the rebuild or refresh, live.
                        my $divider="\0";
                        # then show the rebuild or refresh, live.
                        my $divider="\0";

-                       my $html=IkiWiki::misctemplate("setup", $divider);
+                       my $html=IkiWiki::cgitemplate($cgi, "setup", $divider);

                        IkiWiki::printheader($session);
                        my ($head, $tail)=split($divider, $html, 2);
                        print $head."<pre>\n";
 
                        my @command;
                        if ($form->submitted eq 'Rebuild Wiki') {
                        IkiWiki::printheader($session);
                        my ($head, $tail)=split($divider, $html, 2);
                        print $head."<pre>\n";
 
                        my @command;
                        if ($form->submitted eq 'Rebuild Wiki') {

-                               @command=("ikiwiki", "-setup", $config{setupfile},
-                                        "-rebuild", "-v");
+                               @command=("ikiwiki", "--setup", $config{setupfile},
+                                        "--rebuild", "-v");

                        }
                        else {
                        }
                        else {

-                               @command=("ikiwiki", "-setup", $config{setupfile},
-                                       "-refresh", "-wrappers", "-v");
+                               @command=("ikiwiki", "--setup", $config{setupfile},
+                                       "--refresh", "--wrappers", "-v");

                        }
 
                        close STDERR;
                        }
 
                        close STDERR;