X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ebb2b9cbda42eaff70f13303ad891c6f7aaddb33..949c4c0c3a9d188e263068e675e0f2416f313c15:/IkiWiki/Plugin/map.pm?ds=inline
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 5b6a843e7..328493116 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -9,13 +9,22 @@ package IkiWiki::Plugin::map;
use warnings;
use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
-sub import { #{{{
+sub import {
+ hook(type => "getsetup", id => "map", call => \&getsetup);
hook(type => "preprocess", id => "map", call => \&preprocess);
-} # }}}
+}
-sub preprocess (@) { #{{{
+sub getsetup () {
+ return
+ plugin => {
+ safe => 1,
+ rebuild => undef,
+ },
+}
+
+sub preprocess (@) {
my %params=@_;
$params{pages}="*" unless defined $params{pages};
@@ -71,7 +80,7 @@ sub preprocess (@) { #{{{
my $parent="";
my $indent=0;
my $openli=0;
- my $dummy=0;
+ my $addparent="";
my $map = "
\n
\n";
foreach my $item (sort keys %mapitems) {
my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());
@@ -81,14 +90,14 @@ sub preprocess (@) { #{{{
my $baseitem=IkiWiki::dirname($item);
while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
$parent=IkiWiki::dirname($parent);
- last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/;
+ last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
+ $addparent="";
$indent--;
$map .= "\n";
if ($indent > 0) {
$map .= "
\n";
}
}
- $dummy=0;
while ($depth < $indent) {
$indent--;
$map .= "\n";
@@ -105,11 +114,12 @@ sub preprocess (@) { #{{{
$map .= "
\n";
}
if ($depth > $indent) {
- $dummy=1;
$p.="/".shift(@bits);
+ $addparent=$p;
+ $addparent=~s/^\///;
$map .= "- "
.htmllink($params{page}, $params{destpage},
- $p, class => "mapparent",
+ "/".$common_prefix.$p, class => "mapparent",
noimageinline => 1)
."\n";
$openli=1;
@@ -134,6 +144,6 @@ sub preprocess (@) { #{{{
}
$map .= "
\n";
return $map;
-} # }}}
+}
1