X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=42cc8ba1f5a9a8d0970719ff85a5a1e57161fbdf;hb=03839166e30819c37290f33056f44aaee1583bfc;hp=753c92a2570a398caffd82e176adfb4230122f8a;hpb=fb214ca95fc3d8fb37a94a3fcbdf5ab60a617049;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 753c92a2..42cc8ba1 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -15,6 +15,7 @@ from plugins.querytable              import QueryTable
 from plugins.queryupdater            import QueryUpdater
 from plugins.googlemap               import GoogleMap
 from plugins.senslabmap              import SensLabMap
+from plugins.scheduler               import Scheduler
 from plugins.querycode               import QueryCode
 from plugins.query_editor            import QueryEditor
 from plugins.active_filters          import ActiveFilters
@@ -59,7 +60,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                 'slice_hrn',
                 'resource.hrn', 'resource.hostname', 'resource.type', 
                 'resource.network_hrn',
-                #'lease.urn',
+                'lease.urn',
                 'user.user_hrn',
                 #'application.measurement_point.counter'
         )
@@ -164,16 +165,13 @@ class SliceView (LoginRequiredAutoLogoutView):
             zoom       = 4,
         )
 
-# because (senslab)map.css changes stuff for *all* canvas elements
-# it destroys the googlemap behaviour
-# turning this off for now until Anthony can fix that
-#        resources_as_3dmap = SensLabMap(
-#            page       = page,
-#            title      = '3D Map',
-#            domid      = 'senslabmap',
-#            query      = sq_resource,
-#            query_all  = query_resource_all,
-#        )
+        resources_as_3dmap = SensLabMap(
+            page       = page,
+            title      = '3D Map',
+            domid      = 'senslabmap',
+            query      = sq_resource,
+            query_all  = query_resource_all,
+        )
 
         resources_as_list = QueryTable( 
             page       = page,
@@ -190,6 +188,15 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
+        resources_as_scheduler = Scheduler(
+            page        = page,
+            title       = 'Scheduler',
+            domid       = 'scheduler',
+            query       = sq_resource,
+            query_all_resources = query_resource_all,
+            query_lease = sq_lease,
+        )
+
        # with the new 'Filter' stuff on top, no need for anything but the querytable
         resources_as_list_area = resources_as_list 
 
@@ -198,11 +205,13 @@ class SliceView (LoginRequiredAutoLogoutView):
                                 togglable=True,
                                 title="Resources",
                                 outline_complete=True,
-                                sons=[ resources_as_gmap, 
-# see above
-#                                       resources_as_3dmap,
+                                sons=[ 
+                                       resources_as_scheduler,
+                                       #resources_as_gmap, 
+                                       #resources_as_3dmap,
                                        resources_as_list_area, ],
                                 active_domid = 'resources-map',
+                                persistent_active=True,
                                 )
         main_stack.insert (resources_area)