Merge branch 'master' into aggregateinternal

3 files changed, 18 insertions, 1 deletions

diff --git a/doc/todo/pedigree_plugin.mdwn b/doc/todo/pedigree_plugin.mdwn
index d1eb6fdf9..120820d03 100644
--- a/doc/todo/pedigree_plugin.mdwn
+++ b/doc/todo/pedigree_plugin.mdwn
@@ -73,6 +73,14 @@ Any opinions on the idea/design/implementation?
 >>>   Javascript might do the trick, but if it's getting so complicated, I'll
 >>>   just style my parentlinks another way.
 
+>>>> Perhaps I misunderstood what `is_grand_mother` is supposed to do. The
+>>>> docs were not very clear to me. If it's supposed to be 2 down from
+>>>> the page, (and not from the root), this could be achieved by reversing
+>>>> the `depth_n` variables. So the page gets `depth_1` set, its parent gets
+>>>> `depth_2` set, etc. If you want to be able to include/exclude
+>>>> from both ends, you could also have a `height_n` that is 1 for the
+>>>> root, and counts upwards. --[[Joey]]
+
 >>> In my understanding, your suggestion gives us little more than can already
 >>> be achieved anyway with `HTML::Template`'s `loop_context_vars` (i.e.
 >>> `__first__`, `__last__` and `__counter__`). The only added bonus is doing
@@ -119,6 +127,11 @@ Any opinions on the idea/design/implementation?
 >>> bare minimum. Let's say it is my up-to-date proposal. (Well, if the various
 >>> shortcuts don't really annoy you, I'd be glad to keep them ;)
 
+>>>> This sounds fairly similar to what I just described above. (I called
+>>>> DISTANCE "height".) I don't know about the CSS tricks; seems like if
+>>>> `DEPTH_n` and `DISTANCE_n` are provided, you can test for them inside
+>>>> the loop using HTML::Template's lame testing, and isolate any page or
+>>>> range of pages. --[[Joey]]
 
 (I'll try never to rebase this branch, but writing this plugin has
 been a pretext for me to start learning Git, so...)
diff --git a/t/html.t b/t/html.t
index 66e90d8e3..3faf44154 100755
--- a/t/html.t
+++ b/t/html.t
@@ -6,7 +6,7 @@ use Test::More;
 my @pages;
 
 BEGIN {
-	@pages=qw(index todo features news plugins/map security);
+	@pages=qw(index features news plugins/map security);
 	if (! -x "/usr/bin/validate") {
 		plan skip_all => "/usr/bin/validate html validator not present";
 	}
diff --git a/templates/page.tmpl b/templates/page.tmpl
index d39c9aa2a..f2f9c34cc 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -20,11 +20,15 @@
 <div class="pageheader">
 <div class="header">
 <span>
+<span class="parentlinks">
 <TMPL_LOOP NAME="PARENTLINKS">
 <a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ 
 </TMPL_LOOP>
+</span>
+<span class="title">
 <TMPL_VAR TITLE>
 </span>
+</span><!--.header-->
 <TMPL_IF NAME="SEARCHFORM">
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>