Enabling senslabmap in sliceview and add a message when there are no nodes to display.

diff --git a/plugins/senslabmap/static/js/map.js b/plugins/senslabmap/static/js/map.js
index 6918e7c..4e184cd 100644 (file)
--- a/plugins/senslabmap/static/js/map.js
+++ b/plugins/senslabmap/static/js/map.js
@@ -33,6 +33,10 @@ var Senslab = {
     
     $menu.find("li").eq(0).addClass("active");
     $maps.find("div").eq(0).addClass("active");
     
     $menu.find("li").eq(0).addClass("active");
     $maps.find("div").eq(0).addClass("active");

+
+    if (!sites.length) {
+      $container.text("No nodes to display.");
+    }

   }
 };
 
   }
 };
 

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 753c92a..35ab810 100644 (file)
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -164,16 +164,13 @@ class SliceView (LoginRequiredAutoLogoutView):
             zoom       = 4,
         )
 
             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,
 
         resources_as_list = QueryTable( 
             page       = page,


@@ -199,8 +196,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                                 title="Resources",
                                 outline_complete=True,
                                 sons=[ resources_as_gmap, 
                                 title="Resources",
                                 outline_complete=True,
                                 sons=[ resources_as_gmap, 

-# see above
-#                                       resources_as_3dmap,
+                                       resources_as_3dmap,

                                        resources_as_list_area, ],
                                 active_domid = 'resources-map',
                                 )
                                        resources_as_list_area, ],
                                 active_domid = 'resources-map',
                                 )