X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=fbc43418c92684ec06c589f847250c817ca85593;hb=d549b83164f10793e799da646e6704844607f190;hp=f6494070c84be9be3ffe06aaadc58a8929479879;hpb=9ac5d96ebeaa0136eb89a21f1c28c9b9c78655f9;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index f6494070..fbc43418 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -13,7 +13,7 @@ from plugins.stack.stack             import Stack
 from plugins.tabs.tabs               import Tabs
 from plugins.hazelnut                import Hazelnut 
 from plugins.resources_selected      import ResourcesSelected
-from plugins.googlemaps              import GoogleMaps
+from plugins.googlemap              import GoogleMap
 from plugins.senslabmap.senslabmap   import SensLabMap
 from plugins.querycode.querycode     import QueryCode
 from plugins.query_editor            import QueryEditor
@@ -24,6 +24,9 @@ from plugins.messages.messages       import Messages
 
 tmp_default_slice='ple.upmc.myslicedemo'
 
+# temporary : turn off the users part to speed things up
+do_query_users=True
+
 class SliceView (LoginRequiredAutoLogoutView):
 
     def get (self,request, slicename=tmp_default_slice):
@@ -31,6 +34,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         page = Page(request)
         page.add_css_files ('css/slice-view.css')
         page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });')
+        page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
         page.expose_js_metadata()
     
         metadata = page.get_metadata()
@@ -51,12 +55,14 @@ class SliceView (LoginRequiredAutoLogoutView):
         )
     
         query_resource_all = Query.get('resource').select(resource_fields)
-        query_user_all = Query.get('user').select(user_fields)
+        if do_query_users:
+            query_user_all = Query.get('user').select(user_fields)
     
         aq = AnalyzedQuery(main_query, metadata=metadata)
         page.enqueue_query(main_query, analyzed_query=aq)
         page.enqueue_query(query_resource_all)
-        page.enqueue_query(query_user_all)
+        if do_query_users:
+            page.enqueue_query(query_user_all)
     
         # ... and for the relations
         # XXX Let's hardcode resources for now
@@ -110,7 +116,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         resources_as_list = Hazelnut( 
             page       = page,
             title      = 'Resources as a List',
-            domid      = 'checkboxes',
+            domid      = 'resources_list',
             # this is the query at the core of the slice list
             query      = sq_resource,
             query_all  = query_resource_all,
@@ -118,13 +124,14 @@ class SliceView (LoginRequiredAutoLogoutView):
             datatables_options = { 
                 # for now we turn off sorting on the checkboxes columns this way
                 # this of course should be automatic in hazelnut
-                'aoColumns'      : [None, None, None, None, {'bSortable': False}],
-                'iDisplayLength' : 25,
-                'bLengthChange'  : True,
+                'aoColumns'     : [None, None, None, None, {'bSortable': False}],
+                'iDisplayLength': 25,
+                'bLengthChange' : True,
+                'bAutiWidth'    : True,
                 },
             )
 
-        resources_as_map = GoogleMaps(
+        resources_as_map = GoogleMap(
             page       = page,
             title      = 'Geographic view',
             domid      = 'gmap',
@@ -142,10 +149,12 @@ class SliceView (LoginRequiredAutoLogoutView):
         resources_query_editor = QueryEditor(
             page  = page,
             query = sq_resource,
+            title = "Select Columns",
             )
         resources_active_filters = ActiveFilters(
             page  = page,
             query = sq_resource,
+            title = "Active Filters ?",
             )
 
         resources_area = Stack (
@@ -156,13 +165,17 @@ class SliceView (LoginRequiredAutoLogoutView):
             outline_complete=True,
             sons = [
                 Tabs ( page=page, 
-                       sons=[ resources_as_list, resources_as_map, ] 
+                       sons=[ resources_as_list, resources_as_map, ] ,
+                       active_domid = 'gmap',
+                       ),
+                Tabs ( page=page,
+                       title="Customize Resources layout",
+                       togglable=True,
+                       toggled='persistent',
+                       domid="customize-resources",
+                       outline_complete=True,
+                       sons = [ resources_query_editor, resources_active_filters, ],
                        ),
-                Stack ( page=page,
-                        title="Customize",
-                        togglable=True,
-                        sons = [ resources_query_editor, resources_active_filters, ]
-                        ),
                 ]
             )
 
@@ -201,34 +214,35 @@ class SliceView (LoginRequiredAutoLogoutView):
         # USERS
         # 
     
-        tab_users = Tabs(
-            page                = page,
-            domid               = 'users',
-            outline_complete    = True,
-            togglable           = True,
-            title               = 'Users',
-            active_domid        = 'checkboxes2',
-        )
-        main_stack.insert(tab_users)
+        if do_query_users:
+            tab_users = Tabs(
+                page                = page,
+                domid               = 'users',
+                outline_complete    = True,
+                togglable           = True,
+                title               = 'Users',
+                active_domid        = 'checkboxes2',
+                )
+            main_stack.insert(tab_users)
     
-#        tab_users.insert(Hazelnut( 
-#            page        = page,
-#            title       = 'Users List',
-#            domid       = 'checkboxes2',
-#            # tab's sons preferably turn this off
-#            togglable   = False,
-#            # this is the query at the core of the slice list
-#            query       = sq_user,
-#            query_all  = query_user_all,
-#            checkboxes  = True,
-#            datatables_options = { 
-#                # for now we turn off sorting on the checkboxes columns this way
-#                # this of course should be automatic in hazelnut
-#                'aoColumns'      : [None, None, None, None, {'bSortable': False}],
-#                'iDisplayLength' : 25,
-#                'bLengthChange'  : True,
-#            },
-#        ))
+            tab_users.insert(Hazelnut( 
+                page        = page,
+                title       = 'Users List',
+                domid       = 'checkboxes2',
+                # tab's sons preferably turn this off
+                togglable   = False,
+                # this is the query at the core of the slice list
+                query       = sq_user,
+                query_all  = query_user_all,
+                checkboxes  = True,
+                datatables_options = { 
+                    # for now we turn off sorting on the checkboxes columns this way
+                    # this of course should be automatic in hazelnut
+                    'aoColumns'      : [None, None, None, None, {'bSortable': False}],
+                    'iDisplayLength' : 25,
+                    'bLengthChange'  : True,
+                },
+            ))
     
         tab_measurements = Tabs (
             page                = page,