Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
img: restrict to JPEG, PNG and GIF images by default
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
map.pm
diff --git
a/IkiWiki/Plugin/map.pm
b/IkiWiki/Plugin/map.pm
index ce3ac1d24e93be888ca9e81f597f55d8b2f41424..4a9bf58dbc1a446ae72f37f13089af05fdc7b221 100644
(file)
--- a/
IkiWiki/Plugin/map.pm
+++ b/
IkiWiki/Plugin/map.pm
@@
-72,6
+72,9
@@
sub preprocess (@) {
$common_prefix=IkiWiki::dirname($common_prefix);
}
$common_prefix=IkiWiki::dirname($common_prefix);
}
+ # Set this to 1 or more spaces to pretty-print maps for debugging
+ my $spaces = "";
+
# Create the map.
my $parent="";
my $indent=0;
# Create the map.
my $parent="";
my $indent=0;
@@
-98,18
+101,18
@@
sub preprocess (@) {
$parent=IkiWiki::dirname($parent);
last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
$addparent="";
$parent=IkiWiki::dirname($parent);
last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
$addparent="";
- $indent--;
- $map .= "</li>\n";
- if ($indent > 0) {
- $map .= "</ul>\n";
+ $map .= ($spaces x $indent) . "</li>\n";
+ if ($indent > 1) {
+ $map .= ($spaces x $indent) . "</ul><map:collapse>\n";
}
}
+ $indent--;
}
while ($depth < $indent) {
}
while ($depth < $indent) {
- $indent--;
- $map .= "</li>\n";
- if ($indent > 0) {
- $map .= "</ul>\n";
+ $map .= ($spaces x $indent) . "</li>\n";
+ if ($indent > 1) {
+ $map .= ($spaces x $indent) . "</ul>\n";
}
}
+ $indent--;
}
my @bits=split("/", $item);
my $p="";
}
my @bits=split("/", $item);
my $p="";
@@
-117,13
+120,14
@@
sub preprocess (@) {
while ($depth > $indent) {
$indent++;
if ($indent > 1) {
while ($depth > $indent) {
$indent++;
if ($indent > 1) {
- $map .=
"<ul
>\n";
+ $map .=
($spaces x $indent) . "<ul><map:collapse
>\n";
}
if ($depth > $indent) {
$p.="/".shift(@bits);
$addparent=$p;
$addparent=~s/^\///;
}
if ($depth > $indent) {
$p.="/".shift(@bits);
$addparent=$p;
$addparent=~s/^\///;
- $map .= "<li>"
+ $map .= ($spaces x $indent) . "<li>\n";
+ $map .= ($spaces x $indent)
.htmllink($params{page}, $params{destpage},
"/".$common_prefix.$p, class => "mapparent",
noimageinline => 1)
.htmllink($params{page}, $params{destpage},
"/".$common_prefix.$p, class => "mapparent",
noimageinline => 1)
@@
-134,8
+138,9
@@
sub preprocess (@) {
$openli=0;
}
}
$openli=0;
}
}
- $map .= "</li>\n" if $openli;
- $map .= "<li>"
+ $map .= ($spaces x $indent) . "</li>\n" if $openli;
+ $map .= ($spaces x $indent) . "<li>\n";
+ $map .= ($spaces x $indent)
.htmllink($params{page}, $params{destpage},
"/".$common_prefix."/".$item,
@linktext,
.htmllink($params{page}, $params{destpage},
"/".$common_prefix."/".$item,
@linktext,
@@
-145,9
+150,12
@@
sub preprocess (@) {
$parent=$item;
}
while ($indent > 0) {
$parent=$item;
}
while ($indent > 0) {
+ $map .= ($spaces x $indent) . "</li>\n";
$indent--;
$indent--;
- $map .=
"</li>\n
</ul>\n";
+ $map .=
($spaces x $indent) . "
</ul>\n";
}
}
+ $map =~ s{\n *</ul><map:collapse>\n *<ul><map:collapse>\n}{\n}gs;
+ $map =~ s{<map:collapse>}{}g;
$map .= "</div>\n";
return $map;
}
$map .= "</div>\n";
return $map;
}