From: Harris Lapiroff Date: Wed, 2 Mar 2011 19:59:25 +0000 (-0500) Subject: Merge remote branch 'melinath/master' X-Git-Tag: philo-0.9~17^2~4^2 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/b8668727caf6da1e8425fd32334a4ec5919ce4a2 Merge remote branch 'melinath/master' --- b8668727caf6da1e8425fd32334a4ec5919ce4a2 diff --cc contrib/shipherd/templatetags/shipherd.py index 317fffb,c416e4e..83e98a2 --- a/contrib/shipherd/templatetags/shipherd.py +++ b/contrib/shipherd/templatetags/shipherd.py @@@ -78,11 -51,10 +78,12 @@@ class RecurseNavigationNode(RecurseTree def recursenavigation(parser, token): """ Based on django-mptt's recursetree templatetag. In addition to {{ item }} and {{ children }}, - sets {{ active }} and {{ active_descendants }} in the context. + sets {{ active }}, {{ active_descendants }}, {{ navloop.counter }}, {{ navloop.counter0 }}, + {{ navloop.revcounter }}, {{ navloop.revcounter0 }}, {{ navloop.first }}, {{ navloop.last }}, + and {{ navloop.parentloop }} in the context. - Note that the tag takes one variable, which is a Node instance. + Note that the tag takes two variables: a Node instance and the key of the navigation to + be recursed. Usage: