fix prelude/requirements system

[unfold.git] / engine / prelude.py

diff --git a/engine/prelude.py b/engine/prelude.py
index 6be6441..bf5e0a9 100644 (file)
--- a/engine/prelude.py
+++ b/engine/prelude.py
@@ -1,5 +1,7 @@
 from types import StringTypes, ListType
 
+from django.template.loader import render_to_string
+
 class Prelude:
 
     """A class for collecting dependencies on js/css files or fragments"""
@@ -29,10 +31,29 @@ class Prelude:
     def add_css_chunks (self, x):
         self.css_chunks += Prelude._normalize (x)
 
+    # first attempt was to use a simple dict like this
+    #    env={}
+    #    env['js_files']=  self.js_files
+    #    env['css_files']= self.css_files
+    #    env['js_chunks']= '\n'.join(self.js_chunks)
+    #    env['css_chunks']='\n'.join(self.css_chunks)
+    #    return env
+    # together with this in layout-myslice.html
+    # {% for js_file in js_files %} {% insert_str prelude js_file %} {% endfor %}
+    # {% for css_file in css_files %} {% insert_str prelude css_file %} {% endfor %}
+    # somehow however this would not work too well, 
+    # probably insert_above is not powerful enough to handle that
+    # 
+    # so a much simpler and safer approach is for use to compute the html header directly
     def render_env (self): 
         env={}
         env['js_files']=  self.js_files
         env['css_files']= self.css_files
-        env['js_chunks']= '\n'.join(self.js_chunks)
-        env['css_chunks']='\n'.join(self.css_chunks)
-        return env
+        env['js_chunks']= self.js_chunks
+        env['css_chunks']=self.css_chunks
+        # not sure how this should be done more cleanly
+        from myslice.settings import STATIC_URL
+        env ['STATIC_URL'] = STATIC_URL
+        # render this with prelude.html and put the result in header_prelude
+        header_prelude = render_to_string ('header-prelude.html',env)
+        return { 'header_prelude' : header_prelude }