From: Harris Lapiroff <hlapirof@oberlin.edu>
Date: Thu, 9 Jun 2011 17:19:06 +0000 (-0400)
Subject: Merge branch 'gilbert' of https://github.com/melinath/philo into gilbert
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/9b93dd34886adff50f1415db3a97b09fa1e728fb?hp=498decade1893dd840faf3005b02dca22eaa5d14

Merge branch 'gilbert' of https://github.com/melinath/philo into gilbert
---

diff --git a/philo/contrib/shipherd/templatetags/shipherd.py b/philo/contrib/shipherd/templatetags/shipherd.py
index e3019e1..4723246 100644
--- a/philo/contrib/shipherd/templatetags/shipherd.py
+++ b/philo/contrib/shipherd/templatetags/shipherd.py
@@ -68,10 +68,10 @@ class LazyNavigationRecurser(object):
 
 
 class RecurseNavigationNode(template.Node):
-	def __init__(self, template_nodes, instance_var, key):
+	def __init__(self, template_nodes, instance_var, key_var):
 		self.template_nodes = template_nodes
 		self.instance_var = instance_var
-		self.key = key
+		self.key_var = key_var
 	
 	def render(self, context):
 		try:
@@ -80,9 +80,18 @@ class RecurseNavigationNode(template.Node):
 			return ''
 		
 		instance = self.instance_var.resolve(context)
+		key = self.key_var.resolve(context)
+		
+		# Fall back on old behavior if the key doesn't seem to be a variable.
+		if not key:
+			token = self.key_var.token
+			if token[0] not in ["'", '"'] and '.' not in token:
+				key = token
+			else:
+				return settings.TEMPLATE_STRING_IF_INVALID
 		
 		try:
-			items = instance.navigation[self.key]
+			items = instance.navigation[key]
 		except:
 			return settings.TEMPLATE_STRING_IF_INVALID
 		
@@ -135,17 +144,11 @@ def recursenavigation(parser, token):
 		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(('recurse', 'endrecursenavigation',))
-	
-	token = parser.next_token()
-	if token.contents == 'recurse':
-		template_nodes.append(RecurseNavigationMarker())
-		template_nodes.extend(parser.parse(('endrecursenavigation')))
-		parser.delete_first_token()
+	key_var = parser.compile_filter(bits[2])
 	
-	return RecurseNavigationNode(template_nodes, instance_var, key)
+	template_nodes = parser.parse(('endrecursenavigation',))
+	token = parser.delete_first_token()
+	return RecurseNavigationNode(template_nodes, instance_var, key_var)
 
 
 @register.filter
diff --git a/philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html b/philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html
index 45135ff..f01eb88 100644
--- a/philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html
+++ b/philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html
@@ -28,9 +28,8 @@
 {% block content %}
 	<div class="container-grid delete-confirmation">
 		{% for search in queryset %}
-		{% if not forloop.first and not forloop.last %}<h1>{{ search.string }}</h1>{% endif %}
 		<div class="group tabular">
-			<h2>{% blocktrans %}Results{% endblocktrans %}</h2>{% comment %}For the favored results, add a class?{% endcomment %}
+			<h2>{{ search_string }}</h2>
 			<div class="module table">
 				<div class="module thead">
 					<div class="tr">
diff --git a/philo/contrib/sobol/templates/admin/sobol/search/results.html b/philo/contrib/sobol/templates/admin/sobol/search/results.html
index 44d4e7c..24442c7 100644
--- a/philo/contrib/sobol/templates/admin/sobol/search/results.html
+++ b/philo/contrib/sobol/templates/admin/sobol/search/results.html
@@ -23,9 +23,8 @@
 
 {% block content %}
 		{% for search in queryset %}
-		{% if not forloop.first and not forloop.last %}<h1>{{ search.string }}</h1>{% endif %}
 			<fieldset class="module">
-				<h2>{% blocktrans %}Results{% endblocktrans %}</h2>{% comment %}For the favored results, add a class?{% endcomment %}
+				<h2>{{ search.string }}</h2>
 				<table>
 					<thead>
 						<tr>