X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/b2f456977cd5884c625f704e024213ad86163929..9b40768160da75802636fc2b45c1f68bd36fd7bd:/models/pages.py

diff --git a/models/pages.py b/models/pages.py
index 354293f..ed55ca5 100644
--- a/models/pages.py
+++ b/models/pages.py
@@ -43,9 +43,10 @@ class Template(TreeModel):
 				nodes = []
 				for node in nodelist:
 					try:
-						for nodelist_name in ('nodelist', 'nodelist_loop', 'nodelist_empty', 'nodelist_true', 'nodelist_false', 'nodelist_main'):
-							if hasattr(node, nodelist_name):
-								nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
+						if hasattr(node, 'child_nodelists'):
+							for nodelist_name in node.child_nodelists:
+								if hasattr(node, nodelist_name):
+									nodes.extend(nodelist_container_nodes(getattr(node, nodelist_name)))
 						if isinstance(node, ContainerNode):
 							nodes.append(node)
 						elif isinstance(node, ExtendsNode):
@@ -75,7 +76,7 @@ class Template(TreeModel):
 		return contentlet_node_names, contentreference_node_specs
 	
 	def __unicode__(self):
-		return self.get_path(u' › ', 'name')
+		return self.get_path(pathsep=u' › ', field='name')
 	
 	@staticmethod
 	@fattr(is_usable=True)
@@ -100,7 +101,7 @@ class Page(View):
 	def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
 		context = {}
 		context.update(extra_context or {})
-		context.update({'page': self, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
+		context.update({'node': node, 'page': self, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
 		return HttpResponse(self.template.django_template.render(RequestContext(request, context)), mimetype=self.template.mimetype)
 	
 	def __unicode__(self):