X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/fd72cdf2795d8f1a2681479c375bfb6efad111cd..855ec6e1d29382dcbbfa63aece9e3b127b8ecf11:/models/pages.py?ds=inline

diff --git a/models/pages.py b/models/pages.py
index 3435511..7476f18 100644
--- a/models/pages.py
+++ b/models/pages.py
@@ -10,9 +10,8 @@ from django.template import Context, RequestContext
 from django.template.loader import get_template
 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
 from django.http import HttpResponse
-from django.contrib.sites.models import Site
 from philo.models.base import TreeModel, register_value_model
-from philo.models.nodes import Node
+from philo.models.nodes import View
 from philo.utils import fattr
 from philo.templatetags.containers import ContainerNode
 
@@ -44,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):
@@ -76,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)
@@ -91,27 +91,32 @@ class Template(TreeModel):
 		app_label = 'philo'
 
 
-class Page(Node):
+class Page(View):
 	"""
 	Represents a page - something which is rendered according to a template. The page will have a number of related Contentlets depending on the template selected - but these will appear only after the page has been saved with that template.
 	"""
 	template = models.ForeignKey(Template, related_name='pages')
 	title = models.CharField(max_length=255)
 	
-	def render_to_response(self, request, path=None, subpath=None):
-		return HttpResponse(self.template.django_template.render(RequestContext(request, {'page': self})), mimetype=self.template.mimetype)
+	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, 'relationships': self.relationships})
+		if node and request:
+			context.update({'node': node, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
+			return self.template.django_template.render(RequestContext(request, context))
+		return self.template.django_template.render(Context(context))
+	
+	def 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.get_path(u' › ', 'title')
+		return self.title
 	
 	class Meta:
 		app_label = 'philo'
 
 
-# the following line enables the selection of a node as the root for a given django.contrib.sites Site object
-models.ForeignKey(Node, related_name='sites', null=True, blank=True).contribute_to_class(Site, 'root_node')
-
-
 class Contentlet(models.Model):
 	page = models.ForeignKey(Page, related_name='contentlets')
 	name = models.CharField(max_length=255)