Changeset 1127 for branches/0.8(django)/PyLucid/index.py

Timestamp:

06/29/07 16:05:08 (17 months ago)

Author:

JensDiemer

Message:

* new additional Stylesheet/JavaScript handling. A middleware puts the collected data into the page.
* middleware "pagestats" renamed to "additional_content".
* some code cleanup

Files:

• branches/0.8(django)/PyLucid/index.py (modified) (3 diffs)

branches/0.8(django)/PyLucid/index.py

@@ -40 +40 @@
 from PyLucid.system.URLs import URLs
 
-from PyLucid.tools.content_processors import apply_markup, render_template
+from PyLucid.tools.content_processors import apply_markup, \
+                                                        render_string_template
 
 
@@ -63 +64 @@
         )
 
-    current_page.content = render_template(current_page.content, context)
+    current_page.content = render_string_template(current_page.content, context)
 
     template = current_page.template
     template_content = template.content
 
-    html = render_template(template_content, context)
-
-#    import cgi, pprint
-#    print context
-#    debug = "<hr/><pre>%s</pre></html>" % cgi.escape(pprint.pformat(context))
-#    html = html.replace("</html>", debug)
-
+    html = render_string_template(template_content, context)
     return HttpResponse(html)
 
@@ -107 +102 @@
     # For additional JavaScript and StyleSheet information.
     # JS+CSS from internal_pages or CSS data for pygments
+    # Add into the context object. Would be integraged in the page with the
+    # additional_content middleware.
     context["js_data"] = []
     context["css_data"] = []
+
+    # Add the context to the reponse object.
+    # Used in PyLucid.middlewares.additional_content
+    request.CONTEXT = context
 
     return context