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

3 files changed, 8 insertions, 2 deletions

diff --git a/doc/plugins/map.mdwn b/doc/plugins/map.mdwn
index 44ce9edd4..d50c9b292 100644
--- a/doc/plugins/map.mdwn
+++ b/doc/plugins/map.mdwn
@@ -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 !*/*/*"`
 
diff --git a/doc/plugins/map/discussion.mdwn b/doc/plugins/map/discussion.mdwn
index 9fdd32eeb..814e4f934 100644
--- a/doc/plugins/map/discussion.mdwn
+++ b/doc/plugins/map/discussion.mdwn
@@ -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]]
diff --git a/doc/users/The_TOVA_Company.mdwn b/doc/users/The_TOVA_Company.mdwn
index 0e56ec4f4..406dc7fc1 100644
--- a/doc/users/The_TOVA_Company.mdwn
+++ b/doc/users/The_TOVA_Company.mdwn
@@ -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