Merge branch 'master' into cleanup

[philo.git] / templatetags / containers.py

diff --git a/templatetags/containers.py b/templatetags/containers.py
index 45a9965..25156f2 100644 (file)
--- a/templatetags/containers.py
+++ b/templatetags/containers.py
@@ -9,12 +9,22 @@ register = template.Library()
 
 
 class ContainerNode(template.Node):
+       child_nodelists = ('nodelist_main', 'nodelist_empty',)
+       
        def __init__(self, name, references=None, as_var=None, nodelist_main=None, nodelist_empty=None):
                self.name = name
                self.as_var = as_var
                self.references = references
-               self.nodelist_main = nodelist_main
-               self.nodelist_empty = nodelist_empty
+               
+               if nodelist_main is None:
+                       self.nodelist_main = template.NodeList()
+               else:
+                       self.nodelist_main = nodelist_main
+               
+               if nodelist_empty is None:
+                       self.nodelist_empty = template.NodeList()
+               else:
+                       self.nodelist_empty = nodelist_empty
                
        def render(self, context):
                content = settings.TEMPLATE_STRING_IF_INVALID
@@ -22,6 +32,7 @@ class ContainerNode(template.Node):
                        container_content = self.get_container_content(context['page'])
                
                if self.nodelist_main is None:
+                       self.nodelist_main
                        if container_content and self.as_var:
                                context[self.as_var] = container_content
                                return ''
@@ -30,12 +41,18 @@ class ContainerNode(template.Node):
                if container_content:
                        if self.as_var is None:
                                self.as_var = self.name
+                       
+                       #make a new context 
                        context.push()
                        context[self.as_var] = container_content
-                       return nodelist_main.render(context)
+                       nodelist = template.NodeList()
+                       for node in self.nodelist_main:
+                               nodelist.append(node.render(context))
+                       context.pop()
+                       return nodelist.render(context)
                
-               if nodelist_empty is not None:
-                       return nodelist_empty.render(context)
+               if self.nodelist_empty is not None:
+                       return self.nodelist_empty.render(context)
                
                return ''
        
@@ -104,8 +121,9 @@ def do_container(parser, token):
                        parser.delete_first_token()
                else:
                        nodelist_empty = None
-               return BlockContainerNode(name, references, as_var, nodelist_main, nodelist_empty)
+               return ContainerNode(name, references, as_var, nodelist_main, nodelist_empty)
                
        else: # error
                raise template.TemplateSyntaxError('"%s" template tag provided without arguments (at least one required)' % tag)
-register.tag('container', do_container)
\ No newline at end of file
+register.tag('container', do_container)
+register.tag('blockcontainer', do_container)