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

Conflicts:
	docs/tutorials/shipherd.rst

diff --git a/docs/tutorials/shipherd.rst b/docs/tutorials/shipherd.rst
index 3454ef2..914a6bb 100644 (file)
--- 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 (file)
--- 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 }}