X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/c9f444ffc08eff21b504db84701b7afc21330da9..0763589c29458e7c4e7b7bfb5424b724a112931d:/models/pages.py

diff --git a/models/pages.py b/models/pages.py
index 354293f..e000b1b 100644
--- a/models/pages.py
+++ b/models/pages.py
@@ -14,12 +14,13 @@ from philo.models.base import TreeModel, register_value_model
 from philo.models.nodes import View
 from philo.utils import fattr
 from philo.templatetags.containers import ContainerNode
+from philo.signals import page_about_to_render_to_string, page_finished_rendering_to_string
 
 
 class Template(TreeModel):
 	name = models.CharField(max_length=255)
 	documentation = models.TextField(null=True, blank=True)
-	mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
+	mimetype = models.CharField(max_length=255, default=getattr(settings, 'DEFAULT_CONTENT_TYPE', 'text/html'))
 	code = models.TextField(verbose_name='django template code')
 	
 	@property
@@ -43,9 +44,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 +77,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)
@@ -97,11 +99,28 @@ class Page(View):
 	template = models.ForeignKey(Template, related_name='pages')
 	title = models.CharField(max_length=255)
 	
-	def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+	def get_containers(self):
+		if not hasattr(self, '_containers'):
+			self._containers = self.template.containers
+		return self._containers
+	containers = property(get_containers)
+	
+	def render_to_string(self, node=None, request=None, 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)})
-		return HttpResponse(self.template.django_template.render(RequestContext(request, context)), mimetype=self.template.mimetype)
+		context.update({'page': self, 'attributes': self.attributes, 'relationships': self.relationships})
+		if node and request:
+			context.update({'node': node, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
+			page_about_to_render_to_string.send(sender=self, node=node, request=request, extra_context=context)
+			string = self.template.django_template.render(RequestContext(request, context))
+		else:
+			page_about_to_render_to_string.send(sender=self, node=node, request=request, extra_context=context)
+		 	string = self.template.django_template.render(Context(context))
+		page_finished_rendering_to_string.send(sender=self, string=string)
+		return string
+	
+	def actually_render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+		return HttpResponse(self.render_to_string(node, request, path, subpath, extra_context), mimetype=self.template.mimetype)
 	
 	def __unicode__(self):
 		return self.title