X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/4809d9999c46311cc9fdbe81eefa8c3afd1290b9..6b33b7bcb0da390da4bb1928750f5cdbe1a6800c:/contrib/shipherd/templatetags/shipherd.py

diff --git a/contrib/shipherd/templatetags/shipherd.py b/contrib/shipherd/templatetags/shipherd.py
index db15d46..fa4ec3e 100644
--- a/contrib/shipherd/templatetags/shipherd.py
+++ b/contrib/shipherd/templatetags/shipherd.py
@@ -4,25 +4,28 @@ from django.utils.safestring import mark_safe
 from philo.contrib.shipherd.models import Navigation
 from philo.models import Node
 from mptt.templatetags.mptt_tags import RecurseTreeNode, cache_tree_children
+from django.utils.translation import ugettext as _
 
 
 register = template.Library()
 
 
 class RecurseNavigationNode(RecurseTreeNode):
-	def __init__(self, template_nodes, instance_var):
+	def __init__(self, template_nodes, instance_var, key):
 		self.template_nodes = template_nodes
 		self.instance_var = instance_var
+		self.key = key
 	
-	def _render_node(self, context, node, request):
+	def _render_node(self, context, item, request):
 		bits = []
 		context.push()
-		for child in node.get_children():
-			context['navigation'] = child
+		for child in item.get_children():
+			context['item'] = child
 			bits.append(self._render_node(context, child, request))
-		context['navigation'] = node
+		context['item'] = item
 		context['children'] = mark_safe(u''.join(bits))
-		context['active'] = node.is_active(request)
+		context['active'] = item.is_active(request)
+		context['active_descendants'] = item.has_active_descendants(request)
 		rendered = self.template_nodes.render(context)
 		context.pop()
 		return rendered
@@ -35,33 +38,29 @@ class RecurseNavigationNode(RecurseTreeNode):
 		
 		instance = self.instance_var.resolve(context)
 		
-		if isinstance(instance, Node):
-			qs = Navigation.objects.closest_navigation(instance)
-		elif hasattr(instance, '__iter__'):
-			# Is this the right way to check?
-			qs = instance
-		else:
+		try:
+			navigation = instance.navigation[self.key]
+		except:
 			return settings.TEMPLATE_STRING_IF_INVALID
 		
-		roots = cache_tree_children(qs)
-		bits = [self._render_node(context, node, request) for node in roots]
+		bits = [self._render_node(context, item, request) for item in navigation]
 		return ''.join(bits)
 
 
 @register.tag
 def recursenavigation(parser, token):
 	"""
-	Based on django-mptt's recursetree templatetag. In addition to {{ navigation }} and {{ children }},
-	sets {{ active }} in the context.
+	Based on django-mptt's recursetree templatetag. In addition to {{ item }} and {{ children }},
+	sets {{ active }} and {{ active_descendants }} in the context.
 	
 	Note that the tag takes one variable, which is a Node instance.
 	
 	Usage:
 		<ul>
-			{% recursenavigation node %}
+			{% recursenavigation node main %}
 				<li{% if active %} class='active'{% endif %}>
 					{{ navigation.text }}
-					{% if not navigation.is_leaf_node %}
+					{% if navigation.get_children %}
 						<ul>
 							{{ children }}
 						</ul>
@@ -71,22 +70,37 @@ def recursenavigation(parser, token):
 		</ul>
 	"""
 	bits = token.contents.split()
-	if len(bits) != 2:
-		raise template.TemplateSyntaxError(_('%s tag requires an instance') % bits[0])
+	if len(bits) != 3:
+		raise template.TemplateSyntaxError(_('%s tag requires two arguments: a node and a navigation section name') % bits[0])
 	
 	instance_var = parser.compile_filter(bits[1])
+	key = bits[2]
 	
 	template_nodes = parser.parse(('endrecursenavigation',))
 	parser.delete_first_token()
 	
-	return RecurseNavigationNode(template_nodes, instance_var)
+	return RecurseNavigationNode(template_nodes, instance_var, key)
 
 
 @register.filter
-def has_navigation(node):
-	return bool(Navigation.objects.closest_navigation(node).count())
+def has_navigation(node, key=None):
+	try:
+		nav = node.navigation
+		if key is not None:
+			if key in nav and bool(node.navigation[key]):
+				return True
+			elif key not in node.navigation:
+				return False
+		return bool(node.navigation)
+	except:
+		return False
 
 
 @register.filter
-def targeting_navigation(node):
-	return Navigation.objects.closest_navigation(node).filter(target_node=node).order_by('level', 'lft')
\ No newline at end of file
+def navigation_host(node, key):
+	try:
+		return Navigation.objects.filter(node__in=node.get_ancestors(include_self=True), key=key).order_by('-node__level')[0].node
+	except:
+		if settings.TEMPLATE_DEBUG:
+			raise
+		return node
\ No newline at end of file