urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* map: Render empty nodes on the way to subpages whose parent pages 

are not included in the map.
* map: Fix valid html issue.
master
joey 2007-09-21 17:54:58 +00:00
parent 5f15f6c883
commit 9d75d3005b
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IkiWiki/Plugin/map.pm
View File

@ -35,12 +35,18 @@ sub preprocess (@) { #{{{
add_depends($params{page}, join(" or ", @mapitems)); add_depends($params{page}, join(" or ", @mapitems));
# Create the map. # Create the map.
my $parent="";
my $indent=0; my $indent=0;
my $openli=0; my $openli=0;
my $map = "<div class='map'>\n"; my $map = "<div class='map'>\n";
$map .= "<ul>\n";
foreach my $item (sort @mapitems) { foreach my $item (sort @mapitems) {
my $depth = ($item =~ tr/\//\//); my $depth = ($item =~ tr/\//\//);
my $baseitem=IkiWiki::dirname($item);
while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E/) {
$parent=IkiWiki::dirname($parent);
$indent--;
$map.="</li></ul>\n";
}
while ($depth < $indent) { while ($depth < $indent) {
$indent--; $indent--;
$map.="</li></ul>\n"; $map.="</li></ul>\n";
@ -48,19 +54,25 @@ sub preprocess (@) { #{{{
while ($depth > $indent) { while ($depth > $indent) {
$indent++; $indent++;
$map.="<ul>\n"; $map.="<ul>\n";
$openli=0; if ($depth > $indent) {
$map .= "<li>\n";
$openli=1;
}
else {
$openli=0;
}
} }
$map .= "</li>\n" if $openli; $map .= "</li>\n" if $openli;
$map .= "<li>" $map .= "<li>"
.htmllink($params{page}, $params{destpage}, $item) .htmllink($params{page}, $params{destpage}, $item)
."\n"; ."\n";
$openli=1; $openli=1;
$parent=$item;
} }
while ($indent > 0) { while ($indent > 0) {
$indent--; $indent--;
$map.="</li></ul>\n"; $map.="</li></ul>\n";
} }
$map .= "</li></ul>\n";
$map .= "</div>\n"; $map .= "</div>\n";
return $map; return $map;
} # }}} } # }}}

5
debian/changelog vendored
View File

@ -5,8 +5,11 @@ ikiwiki (2.9) UNRELEASED; urgency=low
Closes: #443344 Closes: #443344
* map: Fully specify paths to links to avoid issues when the bestlink * map: Fully specify paths to links to avoid issues when the bestlink
didn't point to the correct page. didn't point to the correct page.
* map: Render empty nodes on the way to subpages whose parent pages
are not included in the map.
* map: Fix valid html issue.
-- Joey Hess <joeyh@debian.org> Thu, 20 Sep 2007 15:21:29 -0400 -- Joey Hess <joeyh@debian.org> Fri, 21 Sep 2007 13:28:32 -0400
ikiwiki (2.8) unstable; urgency=low ikiwiki (2.8) unstable; urgency=low

2
doc/bugs/Map_sorts_subtags_under_a_different_tag.mdwn
View File

@ -45,3 +45,5 @@ So it's not that the `<ul>` has an empty parent `<li>`, the three tags are
*really* children of `active`. *really* children of `active`.
This really blows my mind. :) This really blows my mind. :)
Rendering issue. [[fixed|done]] --[[Joey]]

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-09-20 15:21-0400\n" "POT-Creation-Date: 2007-09-21 13:25-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"