Merge branch 'master' of ssh://git.onelab.eu/git/myslice

[unfold.git] / unfold / page.py

diff --git a/unfold/page.py b/unfold/page.py
index 52d5877..7c6d60b 100644 (file)
--- a/unfold/page.py
+++ b/unfold/page.py
@@ -34,7 +34,9 @@ class Page:
         self._queue=[]
         # global prelude object
         self.prelude=Prelude(css_files='css/plugin.css')
+        print "Loading... CSS OneLab"
         self.prelude=Prelude(css_files='css/onelab_marko.css')
+#        self.prelude=Prelude(css_files=['css/plugin.css','css/onelab_marko.css',])
 
     # record known plugins hashed on their domid
     def record_plugin (self, plugin):
@@ -141,7 +143,8 @@ class Page:
         self.add_js_chunks("var MANIFOLD_METADATA =" + self.get_metadata().to_json() + ";")
 
     def expose_js_manifold_config (self):
-        self.add_js_chunks(Config.manifold_js_export())
+        config=Config()
+        self.add_js_chunks(config.manifold_js_export())
 
     #################### requirements/prelude management
     # just forward to self.prelude - see decorator above