restore original style for topmenu

[myslice.git] / unfold / page.py

diff --git a/unfold/page.py b/unfold/page.py
index b49dce1..034b33b 100644 (file)
--- 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')
+        self.prelude=Prelude(css_files=[
+                'css/plugin.css','css/onelab_marko.css',])
 
     # record known plugins hashed on their domid
     def record_plugin (self, plugin):
@@ -88,24 +89,49 @@ class Page:
         self.expose_js_manifold_config()
 
 
+# DEPRECATED #    # needs to be called explicitly and only when metadata is actually required
+# DEPRECATED #    # in particular user needs to be logged
+# DEPRECATED #    def get_metadata (self):
+# DEPRECATED #        # look in session's cache - we don't want to retrieve this for every request
+# DEPRECATED #        session=self.request.session
+# DEPRECATED #        if 'manifold' not in session:
+# DEPRECATED #            print "Page.expose_js_metadata: no 'manifold' in session... - cannot retrieve metadata - skipping"
+# DEPRECATED #            return
+# DEPRECATED #        manifold=session['manifold']
+# DEPRECATED #        # if cached, use it
+# DEPRECATED #        if 'metadata' in manifold and isinstance(manifold['metadata'],MetaData):
+# DEPRECATED #            if debug: print "Page.get_metadata: return cached value"
+# DEPRECATED #            return manifold['metadata']
+# DEPRECATED #        # otherwise retrieve it
+# DEPRECATED #        manifold_api_session_auth = session['manifold']['auth']
+# DEPRECATED #        print "get_metadata(), manifold_api_session_auth =", session['manifold']['auth']
+# DEPRECATED #        metadata=MetaData (manifold_api_session_auth)
+# DEPRECATED #        metadata.fetch()
+# DEPRECATED #        # store it for next time
+# DEPRECATED #        manifold['metadata']=metadata
+# DEPRECATED #        if debug: print "Page.get_metadata: return new value"
+# DEPRECATED #        return metadata
+
     # needs to be called explicitly and only when metadata is actually required
     # in particular user needs to be logged
     def get_metadata (self):
         # look in session's cache - we don't want to retrieve this for every request
         session=self.request.session
+
         if 'manifold' not in session:
-            print "Page.expose_js_metadata: no 'manifold' in session... - cannot retrieve metadata - skipping"
-            return
-        manifold=session['manifold']
+            session['manifold'] = {}
+        manifold = session['manifold']
+
         # if cached, use it
         if 'metadata' in manifold and isinstance(manifold['metadata'],MetaData):
             if debug: print "Page.get_metadata: return cached value"
             return manifold['metadata']
-        # otherwise retrieve it
-        manifold_api_session_auth = session['manifold']['auth']
-        metadata=MetaData (manifold_api_session_auth)
+
+        metadata_auth = {'AuthMethod':'anonymous'}
+
+        metadata=MetaData (metadata_auth)
         metadata.fetch()
-            # store it for next time
+        # store it for next time
         manifold['metadata']=metadata
         if debug: print "Page.get_metadata: return new value"
         return metadata
@@ -115,7 +141,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