From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 30 Nov 2012 17:52:09 +0000 (+0100)
Subject: aligned on myslice template
X-Git-Tag: myslice-django-0.1-1~183
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e77a5cf3152f5a57213539be8994dbd85f2ca75f;p=unfold.git

aligned on myslice template
---

diff --git a/slice/templates/slice.html b/slice/templates/slice.html
index 2d4aa335..ac46e921 100644
--- a/slice/templates/slice.html
+++ b/slice/templates/slice.html
@@ -1,7 +1,7 @@
 {% extends 'myslice.html' %}
 
-{% block content %}
+{% block content_main %}
 <p>The URL variable name= {{ name }} </p>
-{{ content_string|safe }}
-{% endblock content %}
+{{ content_main|safe }}
+{% endblock content_main %}
 
diff --git a/slice/views.py b/slice/views.py
index 8eefd1d3..d44b5547 100644
--- a/slice/views.py
+++ b/slice/views.py
@@ -11,7 +11,7 @@ Lorem <span class='bold'>ipsum dolor</span> sit amet, consectetuer adipiscing el
 
     result=render_to_response('slice.html',{'foo':'bar', 
                                             'name':name,
-                                            'content_string' : content_string,
+                                            'content_main' : content_string,
                                             'menu_items' : 
                                             [ { 'label':'item1', 'href': '/url1/'},
                                               { 'label':'Other item', 'href': '/other/'},