X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d0b1b244281102a07f675880c401ca831ff113d4..aab415481de28a7ca3baa7e7d5ba168e962f61e0:/IkiWiki/Plugin/map.pm

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 93ff3194a..af08005b8 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -25,8 +25,13 @@ sub preprocess (@) { #{{{
 	my %mapitems;
 	foreach my $page (keys %pagesources) {
 		if (pagespec_match($page, $params{pages}, location => $params{page})) {
-			$mapitems{$page}=1;
-
+			if (exists $params{show} && 
+			    exists $pagestate{$page}{meta}{$params{show}}) {
+				$mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
+			}
+			else {
+				$mapitems{$page}=$page;
+			}
 			# Check for a common prefix.
 			if (! defined $common_prefix) {
 				$common_prefix=$page;
@@ -37,6 +42,9 @@ sub preprocess (@) { #{{{
 				my @b=split(/\//, $common_prefix);
 				$common_prefix="";
 				while (@a && @b && $a[0] eq $b[0]) {
+					if (length $common_prefix) {
+						$common_prefix.="/";
+					}
 					$common_prefix.=shift(@a);
 					shift @b;
 				}
@@ -45,7 +53,8 @@ sub preprocess (@) { #{{{
 	}
 	
 	# Common prefix should not be a page in the map.
-	while (length $common_prefix && exists $mapitems{$common_prefix}) {
+	while (defined $common_prefix && length $common_prefix &&
+	       exists $mapitems{$common_prefix}) {
 		$common_prefix=IkiWiki::dirname($common_prefix);
 	}
 
@@ -60,19 +69,23 @@ sub preprocess (@) { #{{{
 	my $parent="";
 	my $indent=0;
 	my $openli=0;
+	my $dummy=0;
 	my $map = "<div class='map'>\n<ul>\n";
-	foreach my $item (sort keys %mapitems) {
-		$item=~s/^\Q$common_prefix\E\/// if length $common_prefix;
+	foreach my $item (sort { $mapitems{$a} cmp $mapitems{$b} } keys %mapitems) {
+		$item=~s/^\Q$common_prefix\E\///
+			if defined $common_prefix && length $common_prefix;
 		my $depth = ($item =~ tr/\//\//) + 1;
 		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(\/|$)/;
 			$indent--;
 			$map .= "</li>\n";
 			if ($indent > 0) {
 				$map .= "</ul>\n";
 			}
 		}
+		$dummy=0;
 		while ($depth < $indent) {
 			$indent--;
 			$map .= "</li>\n";
@@ -89,9 +102,12 @@ sub preprocess (@) { #{{{
 				$map .= "<ul>\n";
 			}
 			if ($depth > $indent) {
+				$dummy=1;
 				$p.="/".shift(@bits);
 				$map .= "<li>"
-					.htmllink($params{page}, $params{destpage}, $p, class => "mapparent")
+					.htmllink($params{page}, $params{destpage},
+						 $p, class => "mapparent",
+						 noimageinline => 1)
 					."\n";
 				$openli=1;
 			}
@@ -102,7 +118,9 @@ sub preprocess (@) { #{{{
 		$map .= "</li>\n" if $openli;
 		$map .= "<li>"
 			.htmllink($params{page}, $params{destpage}, 
-				"/".$common_prefix."/".$item, class => "mapitem")
+				"/".$common_prefix."/".$item,
+				linktext => $mapitems{$item},
+				class => "mapitem", noimageinline => 1)
 			."\n";
 		$openli=1;
 		$parent=$item;