map: Add a "show" parameter. "show=title" can be used to display page titles, rather than the default page name. Based on a patch from Jaldhar H. Vyas, Closes: #484510
parent
0f83e169e0
commit
71d984b310
|
@ -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;
|
||||
|
@ -66,7 +71,7 @@ sub preprocess (@) { #{{{
|
|||
my $openli=0;
|
||||
my $dummy=0;
|
||||
my $map = "<div class='map'>\n<ul>\n";
|
||||
foreach my $item (sort keys %mapitems) {
|
||||
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;
|
||||
|
@ -114,6 +119,7 @@ sub preprocess (@) { #{{{
|
|||
$map .= "<li>"
|
||||
.htmllink($params{page}, $params{destpage},
|
||||
"/".$common_prefix."/".$item,
|
||||
linktext => $mapitems{$item},
|
||||
class => "mapitem", noimageinline => 1)
|
||||
."\n";
|
||||
$openli=1;
|
||||
|
|
|
@ -2,6 +2,9 @@ ikiwiki (2.51) UNRELEASED; urgency=low
|
|||
|
||||
* Improve toplevel parentlink to link directly to index.html when usedirs is
|
||||
disabled.
|
||||
* map: Add a "show" parameter. "show=title" can be used to display page
|
||||
titles, rather than the default page name. Based on a patch from
|
||||
Jaldhar H. Vyas, Closes: #484510
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Sun, 15 Jun 2008 15:03:33 -0400
|
||||
|
||||
|
|
|
@ -8,6 +8,11 @@ This plugin generates a hierarchical page map for the wiki. Example usage:
|
|||
If the pages to include are not specified, all pages (and other files) in
|
||||
the wiki are mapped.
|
||||
|
||||
By default, the names of pages are shown in the map. The `show` parameter
|
||||
can be used to show the titles of pages instead. For example:
|
||||
|
||||
\[[map pages="* and !blog/* and !*/Discussion" show=title]]
|
||||
|
||||
Hint: To limit the map to displaying pages less than a certain level deep,
|
||||
use a [[ikiwiki/PageSpec]] like this: `pages="* and !*/*/*"`
|
||||
|
||||
|
|
|
@ -17,4 +17,4 @@ Thoughts, anyone? --[[KarlMW]]
|
|||
We'd also very much like to have an option to display the title of the page instead of the filename in the map plugin. --Andrew
|
||||
|
||||
There's a patch implementing this in [[debbug 484510]]. It needs a few fixes
|
||||
before I merge it. --[[Joey]]
|
||||
before I merge it. Now applied. --[[Joey]]
|
||||
|
|
|
@ -14,7 +14,8 @@ We're looking for the following "standard" wiki features for some of our git-dis
|
|||
|
||||
- Some cleanups on other plugins:
|
||||
- Add the ability to use the meta title to the map plugin.
|
||||
> Patch [[exists|plugins/map/discussion]], just needs some cleanup. --[[Joey]]
|
||||
> Patch [[exists|plugins/map/discussion]], just needs some cleanup.
|
||||
> Now done. --[[Joey]]
|
||||
|
||||
----
|
||||
Looking for a part-time ikiwiki developer
|
||||
|
|
Loading…
Reference in New Issue