Simplify render fields

viewflow/site/templates/viewflow/form/bootstrap3/form.html

@@ -10,7 +10,7 @@
 
     {% if layout %}
         {% viewpart form visible %}
-            {% include layout with parent=layout %}
+            {% render layout %}
         {% endviewpart %}
     {% else %}
         {% viewpart form visible %}

viewflow/site/templates/viewflow/form/bootstrap3/layout/column.html

@@ -1,5 +1,6 @@
+{% load viewform %}
 {% for element in parent.elements %}
     <div>
-         {% include element with parent=element %}
+         {% render element %}
     </div>
 {% endfor %}

viewflow/site/templates/viewflow/form/bootstrap3/layout/fieldset.html

@@ -1,9 +1,10 @@
+{% load viewform %}
 <fieldset>
 {% if parent.label %}
 <legend>{{ parent.label }}</legend>
 {% endif %}
 
 {% for element in parent.elements %}
-    {% include element with parent=element %}
+    {% render element %}
 {% endfor %}
 </fieldset>

viewflow/site/templates/viewflow/form/bootstrap3/layout/layout.html

@@ -1,3 +1,4 @@
+{% load viewform %}
 {% for element in parent.elements %}
-    {% include element with parent=element %}
+    {% render element %}
 {% endfor %}

viewflow/site/templates/viewflow/form/bootstrap3/layout/row.html

@@ -1,7 +1,8 @@
+{% load viewform %}
 <div class="row">
     {% for element, span in parent.container_12 %}
     <div class="col-md-{{ span }} columns">
-        {% include element with parent=element %}
+        {% render element %}
     </div>
     {% endfor %}
 </div>

viewflow/site/templatetags/viewform.py

@@ -107,6 +107,22 @@ def render_tag(self, context):
         return value
 
 
+@template_tag(register, 'render')
+class RenderNode(BaseNode):
+    """
+    Simplifyed include tag for form layout elements
+
+    Usage:
+
+        {% render layout_elem %}
+    """
+    max_args = 1
+
+    def render_tag(self, context, element):
+        with context.push({'parent': element}):
+                return element.render(context)
+
+
 @template_tag(register, 'viewfield')
 class ViewFieldNode(BaseNode):
     """