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?hp=0cbc3b76a93d6c69e649378a10b75aa57cc7165d

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

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

diff --git a/docs/tutorials/shipherd.rst b/docs/tutorials/shipherd.rst
index 3454ef2..914a6bb 100644
--- a/docs/tutorials/shipherd.rst
+++ b/docs/tutorials/shipherd.rst
@@ -41,7 +41,7 @@ All you need to do now is show the navigation in the template! This is quite eas
 	        <ul>
 	            {% recursenavigation node "main" %}
 	                <li{% if navloop.active %} class="active"{% endif %}>
-	                    {{ item.text }}
+	                    <a href="{{ item.get_target_url }}">{{ item.text }}</a>
 	                </li>
 	            {% endrecursenavigation %}
 	        </ul>
diff --git a/philo/contrib/shipherd/templatetags/shipherd.py b/philo/contrib/shipherd/templatetags/shipherd.py
index f522dfa..4fae9c4 100644
--- a/philo/contrib/shipherd/templatetags/shipherd.py
+++ b/philo/contrib/shipherd/templatetags/shipherd.py
@@ -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 }}