X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=9d335f49671332483b06ec9ab9e94274a550eb67;hb=be1dd95ef614c4ae1793c17dcc7edb96c2a69e1a;hp=a4efdbd1ec8c9a2eaf383e01d9d660f6d8b19625;hpb=9961edb421c6156048be5688d249047daf250e70;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index a4efdbd1..9d335f49 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
@@ -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,35 +172,9 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
-        resources_query_editor = QueryEditor(
-            page  = page,
-            query = query_resource_all,
-            title = "Select Columns",
-            domid = '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,
@@ -215,52 +216,52 @@ class SliceView (LoginRequiredAutoLogoutView):
                     'bAutoWidth'     : True,
                 },
             ))
-    
+# DEMO    
         # --------------------------------------------------------------------------
         # MEASUREMENTS
-        tab_measurements = Tabs (
-            page                = page,
-            active_domid        = 'measurements-list',
-            outline_complete    = True,
-            togglable           = True,
-            title               = 'Measurements',
-            domid               = 'measurements',
-        )
-        main_stack.insert(tab_measurements)
-    
-        tab_measurements.insert(Hazelnut( 
-            page        = page,
-            title       = 'Measurements',
-            domid       = 'measurements-list',
-            # tab's sons preferably turn this off
-            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,
-                'bLengthChange'  : True,
-                'bAutoWidth'     : True,
-            },
-        ))
-    
-        # --------------------------------------------------------------------------
-        # MESSAGES (we use transient=False for now)
-        main_stack.insert(Messages(
-            page   = page,
-            title  = "Runtime messages for slice %s"%slicename,
-            domid  = "msgs-pre",
-            levels = "ALL",
-            # plain messages are probably less nice for production but more reliable for development for now
-            transient = False,
-            # these make sense only in non-transient mode..
-            togglable = True,
-            toggled = 'persistent',
-            outline_complete = True,
-        ))
-    
+#        tab_measurements = Tabs (
+#            page                = page,
+#            active_domid        = 'measurements-list',
+#            outline_complete    = True,
+#            togglable           = True,
+#            title               = 'Measurements',
+#            domid               = 'measurements',
+#        )
+#        main_stack.insert(tab_measurements)
+#    
+#        tab_measurements.insert(Hazelnut( 
+#            page        = page,
+#            title       = 'Measurements',
+#            domid       = 'measurements-list',
+#            # tab's sons preferably turn this off
+#            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,
+#                'bLengthChange'  : True,
+#                'bAutoWidth'     : True,
+#            },
+#        ))
+#    
+#        # --------------------------------------------------------------------------
+#        # MESSAGES (we use transient=False for now)
+#        main_stack.insert(Messages(
+#            page   = page,
+#            title  = "Runtime messages for slice %s"%slicename,
+#            domid  = "msgs-pre",
+#            levels = "ALL",
+#            # plain messages are probably less nice for production but more reliable for development for now
+#            transient = False,
+#            # these make sense only in non-transient mode..
+#            togglable = True,
+#            toggled = 'persistent',
+#            outline_complete = True,
+#        ))
+#    
     
         # variables that will get passed to the view-unfold1.html template
         template_env = {}