git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove duplicate css file (onelab_marko) and group all common stuff in base.html
[myslice.git]
/
unfold
/
page.py
diff --git
a/unfold/page.py
b/unfold/page.py
index
02fb9b7
..
c61d159
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
# 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):
# record known plugins hashed on their domid
def record_plugin (self, plugin):
@@
-80,7
+81,7
@@
class Page:
result={'query_uuid':a}
if b: result['domid']=b
return result
result={'query_uuid':a}
if b: result['domid']=b
return result
- env['query_
publish_dom
_tuples'] = [ query_publish_dom_tuple (a,b) for (a,b) in self._queue ]
+ env['query_
exec
_tuples'] = [ query_publish_dom_tuple (a,b) for (a,b) in self._queue ]
javascript = render_to_string ("page-queries.js",env)
self.add_js_chunks (javascript)
# self.reset_queue()
javascript = render_to_string ("page-queries.js",env)
self.add_js_chunks (javascript)
# self.reset_queue()
@@
-106,7
+107,7
@@
class Page:
metadata_auth = {'AuthMethod':'anonymous'}
metadata=MetaData (metadata_auth)
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"
# 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..
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()
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
#################### 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
@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
def add_js_chunks (self):pass
@to_prelude
def add_css_chunks (self):pass