X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=753fed26906e7386a2e91df9ff92050ef48bb12a;hb=f19bceaa080ab47bae751cd0597a9fb32d1b6b4f;hp=4be14fe1c6623193d6f99995b2213cd8671f5d67;hpb=db472b7481789ae4e7ce16d9732428a3b10e8e14;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index 4be14fe1..753fed26 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -30,6 +30,9 @@ tmp_default_slice='ple.upmc.myslicedemo' #do_query_users=True do_query_users=False +insert_messages=False +#insert_messages=True + class SliceView (LoginRequiredAutoLogoutView): def get (self,request, slicename=tmp_default_slice): @@ -145,7 +148,7 @@ class SliceView (LoginRequiredAutoLogoutView): # RESOURCES # the resources part is made of a Tabs (Geographic, List), - resources_as_map = GoogleMap( + resources_as_gmap = GoogleMap( page = page, title = 'Geographic view', domid = 'resources-map', @@ -153,6 +156,7 @@ class SliceView (LoginRequiredAutoLogoutView): togglable = False, query = sq_resource, query_all = query_resource_all, + googlemap_api_key = Config().googlemap_api_key(), checkboxes = True, # center on Paris latitude = 49., @@ -160,7 +164,7 @@ class SliceView (LoginRequiredAutoLogoutView): zoom = 4, ) - resources_as_map = SensLabMap( + resources_as_3dmap = SensLabMap( page = page, title = '3D Map', domid = 'senslabmap', @@ -191,8 +195,11 @@ class SliceView (LoginRequiredAutoLogoutView): togglable=True, title="Resources", outline_complete=True, - sons=[ resources_as_map, resources_as_list_area ], + sons=[ resources_as_gmap, + resources_as_3dmap, + resources_as_list_area, ], active_domid = 'resources-map', + persistent_active=True, ) main_stack.insert (resources_area) @@ -315,19 +322,20 @@ class SliceView (LoginRequiredAutoLogoutView): # # # -------------------------------------------------------------------------- # # MESSAGES (we use transient=False for now) -# main_stack.insert(Messages( -# page = page, -# title = "Runtime messages for slice %s"%slicename, -# domid = "msgs-pre", -# levels = "ALL", -# # plain messages are probably less nice for production but more reliable for development for now -# transient = False, -# # these make sense only in non-transient mode.. -# togglable = True, -# toggled = 'persistent', -# outline_complete = True, -# )) -# + if insert_messages: + main_stack.insert(Messages( + page = page, + title = "Runtime messages for slice %s"%slicename, + domid = "msgs-pre", + levels = "ALL", + # plain messages are probably less nice for production but more reliable for development for now + transient = False, + # these make sense only in non-transient mode.. + togglable = True, + toggled = 'persistent', + outline_complete = True, + )) + # variables that will get passed to the view-unfold1.html template template_env = {}