X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=2f22789dede54adec4a957bc9eb5f13830045694;hb=730273df1aae00c1c3c12b16d8447adee5da4bf9;hp=fe95764c8b4f26f95e2df686b91ce94c5b4ee33e;hpb=17adeda45d99976cc0b7acecf80a4f147efcdc1f;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index fe95764c..2f22789d 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,8 +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'
@@ -111,7 +111,33 @@ class SliceView (LoginRequiredAutoLogoutView):
             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,
+            toggled             = 'persistent',
+            outline_complete    = True, 
+        )
+        main_stack.insert (filters_area)
+
         # --------------------------------------------------------------------------
         # RESOURCES
         # the resources part is made of a Tabs (Geographic, List), 
@@ -134,6 +160,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         resources_as_list = Hazelnut( 
             page       = page,
             domid      = 'resources-list',
+            title      = 'List view',
             # this is the query at the core of the slice list
             query      = sq_resource,
             query_all  = query_resource_all,
@@ -145,34 +172,9 @@ 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 ?",
-            )
+        # with the new 'Filter' stuff on top, no need for anything but the hazelnut
+        resources_as_list_area = resources_as_list 
 
-        # List area itself is a Stack with hazelnut on top,
-        # and a togglable tabs for customization plugins 
-        resources_as_list_area = Stack(
-            page        = page,
-            title       = 'Resources as a List',
-            domid       = 'resources-list-area',
-            sons= [ resources_as_list, 
-                    Tabs ( page=page,
-                           title="Customize Resources layout",
-                           togglable=True,
-                           toggled='persistent',
-                           domid="customize-resources",
-                           outline_complete=True,
-                           sons = [ resources_query_editor, resources_active_filters, ],
-                           ),
-                    ],
-            )
         resources_area = Tabs ( page=page, 
                                 domid="resources",
                                 togglable=True,