X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=fff0371309ceeb27577f1a4e9433e72600378e1a;hb=660bb053b1b501b225ba97ff7f14167fe7b06a0a;hp=d27d67757cff96a058d478e68bb6caf9fb0a058f;hpb=506d53313a317ac1af631a15f489ef6f73bfc8a4;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index d27d6775..fff03713 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -34,7 +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("users turned %s"); });'%"on" if do_query_users else "off") + 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() @@ -116,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, @@ -124,9 +124,10 @@ 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, }, ) @@ -148,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 ( @@ -162,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, ] - ), ] )