ugly bug

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

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index 7e53fe068546488518a79c13365d3c1ee21c45da..f54d94ad52366110e29f20575672bcd0fcc4413c 100644 (file)
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -3,18 +3,19 @@ package IkiWiki::Plugin::mirrorlist;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "mirrorlist", call => \&getsetup);
        hook(type => "pagetemplate", id => "mirrorlist", call => \&pagetemplate);
        hook(type => "getsetup", id => "mirrorlist", call => \&getsetup);
        hook(type => "pagetemplate", id => "mirrorlist", call => \&pagetemplate);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
                        rebuild => 1,
        return
                plugin => {
                        safe => 1,
                        rebuild => 1,

+                       section => "web",

                },
                mirrorlist => {
                        type => "string",
                },
                mirrorlist => {
                        type => "string",


@@ -23,19 +24,23 @@ sub getsetup () { #{{{
                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },

-} #}}}
+}

 
 

-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {

        my %params=@_;
         my $template=$params{template};
        
        my %params=@_;
         my $template=$params{template};
        

-       $template->param(extrafooter => mirrorlist($params{page}))
-               if $template->query(name => "extrafooter");
-} # }}}
+       if ($template->query(name => "extrafooter") &&
+           keys %{$config{mirrorlist}} > 0) {
+               my $value=$template->param("extrafooter");
+               $value.=mirrorlist($params{page});
+               $template->param(extrafooter => $value);
+       }
+}

 
 

-sub mirrorlist ($) { #{{{
+sub mirrorlist ($) {

        my $page=shift;
        my $page=shift;

-       return "<p>".
+       return ($config{html5} ? '<nav id="mirrorlist">' : '<div>').

                (keys %{$config{mirrorlist}} > 1 ? gettext("Mirrors") : gettext("Mirror")).
                ": ".
                join(", ",
                (keys %{$config{mirrorlist}} > 1 ? gettext("Mirrors") : gettext("Mirror")).
                ": ".
                join(", ",


@@ -45,7 +50,7 @@ sub mirrorlist ($) { #{{{
                                qq{">$_</a>}
                        } keys %{$config{mirrorlist}}
                ).
                                qq{">$_</a>}
                        } keys %{$config{mirrorlist}}
                ).

-               "</p>";
-} # }}}
+               ($config{html5} ? '</nav>' : '</div>');
+}

 
 1
 
 1