X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=b9293b99b63f1d6918f188dbe3e40eeaa425bc12;hb=35cb296cb7d4d71d9ef7934dd682a18086afd9da;hp=0e514dd9e226122ecab71f6b6ed7922f5b6e79b1;hpb=a387c58445b7cde5ecf05a022c5a875645eeb463;p=unfold.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 0e514dd9..b9293b99 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -14,7 +14,7 @@ from plugins.tabs                    import Tabs
 from plugins.hazelnut                import Hazelnut 
 from plugins.resources_selected      import ResourcesSelected
 from plugins.googlemap               import GoogleMap
-from plugins.senslabmap.senslabmap   import SensLabMap
+from plugins.senslabmap              import SensLabMap
 from plugins.querycode               import QueryCode
 from plugins.query_editor            import QueryEditor
 from plugins.active_filters          import ActiveFilters
@@ -51,7 +51,8 @@ class SliceView (LoginRequiredAutoLogoutView):
         main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
         main_query.select(
                 'slice_hrn',
-                'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn',
+                'resource.hrn', 'resource.hostname', 'resource.type', 
+                'resource.network_hrn',
                 #'lease.urn',
                 'user.user_hrn',
                 #'application.measurement_point.counter'
@@ -105,10 +106,39 @@ class SliceView (LoginRequiredAutoLogoutView):
             title               = 'Pending operations',
             query               = main_query,
             togglable           = True,
+            # start turned off, it will open up itself when stuff comes in
+            toggled             = False, 
             domid               = 'pending',
             outline_complete    = True,
         ))
-    
+
+        # --------------------------------------------------------------------------
+        # Filter Resources
+       
+        filter_query_editor = QueryEditor(
+            page  = page,
+            query = sq_resource, 
+            query_all = query_resource_all,
+            title = "Select Columns",
+            domid = 'select-columns',
+            )
+        filter_active_filters = ActiveFilters(
+            page  = page,
+            query = sq_resource,
+            title = "Active Filters",
+            )
+        filters_area = Stack(
+            page                = page,
+            title               = 'Filter Resources',
+            domid               = 'filters',
+            sons                = [filter_query_editor, filter_active_filters],
+            togglable           = True,
+            # start turned off, it will open up itself when stuff comes in
+            toggled             = False,
+            outline_complete    = True, 
+        )
+        main_stack.insert (filters_area)
+
         # --------------------------------------------------------------------------
         # RESOURCES
         # the resources part is made of a Tabs (Geographic, List), 
@@ -142,17 +172,6 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
-        resources_query_editor = QueryEditor(
-            page  = page,
-            query = query_resource_all,
-            title = "Select Columns",
-            )
-        resources_active_filters = ActiveFilters(
-            page  = page,
-            query = sq_resource,
-            title = "Active Filters ?",
-            )
-
         # List area itself is a Stack with hazelnut on top,
         # and a togglable tabs for customization plugins 
         resources_as_list_area = Stack(
@@ -166,7 +185,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                            toggled='persistent',
                            domid="customize-resources",
                            outline_complete=True,
-                           sons = [ resources_query_editor, resources_active_filters, ],
+                           #sons = [ resources_query_editor, resources_active_filters, ],
                            ),
                     ],
             )
@@ -232,6 +251,8 @@ class SliceView (LoginRequiredAutoLogoutView):
             togglable   = False,
             # this is the query at the core of the slice list
             query       = sq_measurement,
+            # do NOT set checkboxes to False
+            # this table being otherwise empty, it just does not fly with dataTables
             checkboxes  = True,
             datatables_options = { 
                 'iDisplayLength' : 25,