X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=unfold%2Fpage.py;h=c61d1593c37e59f3d8f11b92d055c9c8512fc473;hb=d8b349aeaca7af55f020f7344863003a1a478c0a;hp=40446e6b54324f48107c31c4949daf7e0dd235be;hpb=6e286d340b35106b65a543ecd1a3c8086953f50e;p=myslice.git diff --git a/unfold/page.py b/unfold/page.py index 40446e6b..c61d1593 100644 --- a/unfold/page.py +++ b/unfold/page.py @@ -33,7 +33,8 @@ class Page: # queue of queries with maybe a domid, see enqueue_query self._queue=[] # global prelude object - self.prelude=Prelude(css_files=['css/plugin.css','css/onelab_marko.css',]) + # global requirements should go in base.html + self.prelude=Prelude() # record known plugins hashed on their domid def record_plugin (self, plugin): @@ -106,7 +107,7 @@ class Page: metadata_auth = {'AuthMethod':'anonymous'} metadata=MetaData (metadata_auth) - metadata.fetch() + metadata.fetch(self.request) # store it for next time manifold['metadata']=metadata if debug: print "Page.get_metadata: return new value" @@ -115,11 +116,11 @@ class Page: def expose_js_metadata (self): # expose global MANIFOLD_METADATA as a js variable # xxx this is fetched synchroneously.. - self.add_js_chunks("var MANIFOLD_METADATA =" + self.get_metadata().to_json() + ";") + self.add_js_init_chunks("var MANIFOLD_METADATA =" + self.get_metadata().to_json() + ";") def expose_js_manifold_config (self): config=Config() - self.add_js_chunks(config.manifold_js_export()) + self.add_js_init_chunks(config.manifold_js_export()) #################### requirements/prelude management # just forward to self.prelude - see decorator above @@ -128,6 +129,8 @@ class Page: @to_prelude def add_css_files (self):pass @to_prelude + def add_js_init_chunks (self):pass + @to_prelude def add_js_chunks (self):pass @to_prelude def add_css_chunks (self):pass