X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=74101f2cf847e6aeeaf56e0d9230dbb3d218f4e3;hb=f0dee854c76a1b065550eff5989abff77e87cb32;hp=24567f3862fbef72e8e7ec348b2e816233b62c9a;hpb=fc29adc67fe378ae2b962fe99bd2bc1513d9dffd;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 24567f38..74101f2c 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -1,26 +1,27 @@
 from django.template                 import RequestContext
 from django.shortcuts                import render_to_response
 
-from portal.templateviews            import LoginRequiredAutoLogoutView
+from unfold.loginrequired            import LoginRequiredAutoLogoutView
 
 from unfold.page                     import Page
 from manifold.core.query             import Query, AnalyzedQuery
 
-from myslice.viewutils               import topmenu_items, the_user
+from ui.topmenu                      import topmenu_items, the_user
 
-from plugins.raw.raw                 import Raw
-from plugins.stack.stack             import Stack
-from plugins.tabs.tabs               import Tabs
+from plugins.raw                     import Raw
+from plugins.stack                   import Stack
+from plugins.tabs                    import Tabs
 from plugins.hazelnut                import Hazelnut 
 from plugins.resources_selected      import ResourcesSelected
-from plugins.googlemap              import GoogleMap
+from plugins.googlemap               import GoogleMap
 from plugins.senslabmap.senslabmap   import SensLabMap
-from plugins.querycode.querycode     import QueryCode
+from plugins.querycode               import QueryCode
 from plugins.query_editor            import QueryEditor
 from plugins.active_filters          import ActiveFilters
-from plugins.quickfilter.quickfilter import QuickFilter
-from plugins.messages.messages       import Messages
-#from plugins.updater                 import Updater
+from plugins.quickfilter             import QuickFilter
+from plugins.messages                import Messages
+
+from myslice.config                  import Config
 
 tmp_default_slice='ple.upmc.myslicedemo'
 
@@ -33,8 +34,10 @@ 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.add_js_files  ( [ "js/common.functions.js" ] )
+        page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });')
+        page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
+        page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(Config.manifold_url()))
         page.expose_js_metadata()
     
         metadata = page.get_metadata()
@@ -121,8 +124,8 @@ class SliceView (LoginRequiredAutoLogoutView):
             checkboxes = True,
             # center on Paris
             latitude   = 49.,
-            longitude  = 2.2,
-            zoom       = 3,
+            longitude  = 9,
+            zoom       = 4,
         )
 
         resources_as_list = Hazelnut( 
@@ -138,13 +141,13 @@ class SliceView (LoginRequiredAutoLogoutView):
                 'aoColumns'     : [None, None, None, None, {'bSortable': False}],
                 'iDisplayLength': 25,
                 'bLengthChange' : True,
-                'bAutiWidth'    : True,
+                'bAutoWidth'    : True,
                 },
             )
 
         resources_query_editor = QueryEditor(
             page  = page,
-            query = sq_resource,
+            query = query_resource_all,
             title = "Select Columns",
             )
         resources_active_filters = ActiveFilters(
@@ -206,11 +209,9 @@ class SliceView (LoginRequiredAutoLogoutView):
                 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,
+                    'bAutoWidth'     : True,
                 },
             ))
     
@@ -236,11 +237,9 @@ class SliceView (LoginRequiredAutoLogoutView):
             query       = sq_measurement,
             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,
+                'bAutoWidth'     : True,
             },
         ))