diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-06-15 19:08:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-06-15 19:08:24 -0400 |
| commit | ebb2b9cbda42eaff70f13303ad891c6f7aaddb33 (patch) | |
| tree | cd22fe403cf6cbaad00da40301a15e0742d2d3b3 /IkiWiki/Plugin/map.pm | |
| parent | ce029bfe044445d3d1fc10926c2ab6b9305753e0 (diff) | |
| download | ikiwiki-ebb2b9cbda42eaff70f13303ad891c6f7aaddb33.tar ikiwiki-ebb2b9cbda42eaff70f13303ad891c6f7aaddb33.tar.gz | |
bugfixes for show=title
Can't sort by titles; the tree building logic requires that the list be
sorted by page name.
Setting linktext => $page is not the same as omitting it entirely. So some
contortions to only set linktext when the page name is not being shown.
Diffstat (limited to 'IkiWiki/Plugin/map.pm')
| -rw-r--r-- | IkiWiki/Plugin/map.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index 22f75b9e5..5b6a843e7 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -31,7 +31,7 @@ sub preprocess (@) { #{{{ $mapitems{$page}=$pagestate{$page}{meta}{$params{show}}; } else { - $mapitems{$page}=$page; + $mapitems{$page}=''; } # Check for a common prefix. if (! defined $common_prefix) { @@ -73,7 +73,8 @@ sub preprocess (@) { #{{{ my $openli=0; my $dummy=0; my $map = "<div class='map'>\n<ul>\n"; - foreach my $item (sort { $mapitems{$a} cmp $mapitems{$b} } keys %mapitems) { + foreach my $item (sort keys %mapitems) { + my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ()); $item=~s/^\Q$common_prefix\E\/// if defined $common_prefix && length $common_prefix; my $depth = ($item =~ tr/\//\//) + 1; @@ -121,7 +122,7 @@ sub preprocess (@) { #{{{ $map .= "<li>" .htmllink($params{page}, $params{destpage}, "/".$common_prefix."/".$item, - linktext => $mapitems{$item}, + @linktext, class => "mapitem", noimageinline => 1) ."\n"; $openli=1; |