From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Mon, 27 Jun 2011 20:42:53 +0000 (-0400)
Subject: Merge git://github.com/derega/philo into develop. Merged derega's nav example changes... 
X-Git-Tag: philo-0.9.1^2~5^2~3
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/eeb8a55da97f1b778b78324190f502c4cf7da77c

Merge git://github.com/derega/philo into develop. Merged derega's nav example changes into templatetag docstring as well.

Conflicts:
	docs/tutorials/shipherd.rst
---

eeb8a55da97f1b778b78324190f502c4cf7da77c
diff --cc philo/contrib/shipherd/templatetags/shipherd.py
index f522dfa,85a0bc5..4fae9c4
--- a/philo/contrib/shipherd/templatetags/shipherd.py
+++ b/philo/contrib/shipherd/templatetags/shipherd.py
@@@ -131,7 -131,7 +131,7 @@@ def recursenavigation(parser, token)
  		<ul>
  		    {% recursenavigation node "main" %}
  		        <li{% if navloop.active %} class='active'{% endif %}>
--		            {{ item.text }}
++		            <a href="{{ item.get_target_url }}">{{ item.text }}</a>
  		            {% if item.get_children %}
  		                <ul>
  		                    {{ children }}