Merge branch 'master' into scheduler

diff --combined portal/sliceview.py
index 60415a4,35ab810..006aa87
--- 1/portal/sliceview.py
--- 2/portal/sliceview.py
+++ b/portal/sliceview.py
@@@ -15,7 -15,6 +15,7 @@@ from plugins.querytable              im
  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
@@@ -60,7 -59,7 +60,7 @@@ class SliceView (LoginRequiredAutoLogou
                  'slice_hrn',
                  'resource.hrn', 'resource.hostname', 'resource.type', 
                  'resource.network_hrn',
 -                #'lease.urn',
 +                'lease.urn',
                  'user.user_hrn',
                  #'application.measurement_point.counter'
          )
@@@ -157,6 -156,7 +157,7 @@@
              togglable  = False,
              query      = sq_resource,
              query_all  = query_resource_all,
+             googlemap_api_key = Config().googlemap_api_key(),
              checkboxes = True,
              # center on Paris
              latitude   = 49.,
@@@ -187,14 -187,6 +188,14 @@@
                  },
              )
  
 +        resources_as_scheduler = Scheduler(
 +            page        = page,
 +            title       = 'Scheduler',
 +            domid       = 'scheduler',
 +            query       = sq_resource,
 +            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 
  
@@@ -203,10 -195,8 +204,10 @@@
                                  togglable=True,
                                  title="Resources",
                                  outline_complete=True,
 -                                sons=[ resources_as_gmap, 
 -                                       resources_as_3dmap,
 +                                sons=[ 
 +                                       resources_as_scheduler,
 +                                       #resources_as_gmap, 
 +                                       #resources_as_3dmap,
                                         resources_as_list_area, ],
                                  active_domid = 'resources-map',
                                  )