X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Fsliceview.py;h=eaec3faa038258630b98517b106a520291adbb87;hb=20e712f9703d8b2eaf226fdf8807315edcea6a9a;hp=5a47c7497669b116737bb434fb621a7fb81fc9b5;hpb=b2567e7154bbc91e4927559ccd89c8896a106889;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index 5a47c749..eaec3faa 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -29,7 +29,7 @@ from plugins.quickfilter import QuickFilter from plugins.messages import Messages from plugins.slicestat import SliceStat -from myslice.config import Config +from myslice.configengine import ConfigEngine tmp_default_slice='ple.upmc.myslicedemo' @@ -56,8 +56,7 @@ class SliceView (LoginRequiredAutoLogoutView): page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });') page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off")) page.add_js_chunks ('$(function() { messages.debug("sliceview: leases turned %s"); });'%("on" if do_query_leases else "off")) - config=Config() - page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url())) + page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(ConfigEngine().manifold_url())) metadata = page.get_metadata() resource_md = metadata.details_by_object('resource') @@ -199,7 +198,7 @@ class SliceView (LoginRequiredAutoLogoutView): query = sq_resource, query_all = query_resource_all, # this key is the one issued by google - googlemap_api_key = Config().googlemap_api_key(), + googlemap_api_key = ConfigEngine().googlemap_api_key(), # the key to use at init-time init_key = main_query_init_key, checkboxes = True, @@ -361,13 +360,14 @@ class SliceView (LoginRequiredAutoLogoutView): ) tab_measurements = Tabs ( page=page, - domid="measurements", - togglable=True, - toggled = False, - title="Measurements", + domid = "measurements", + togglable = True, + toggled = 'persistent', + title = "Measurements", outline_complete=True, - sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ], - active_domid = 'measurements_stats_cpu', + sons = [ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ], + active_domid = 'resources-stats-cpu', + persistent_active = True, ) main_stack.insert (tab_measurements)