From: Thierry Parmentelat Date: Mon, 16 Sep 2013 10:10:21 +0000 (+0200) Subject: review slice view layout X-Git-Tag: myslice-0.2-3~12 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=2e02ce3947cb83f38406c2e67a3d4cac3f93ce6c review slice view layout --- diff --git a/portal/sliceview.py b/portal/sliceview.py index e4e1bc5f..c9e41b90 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -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, ] - ), ] ) diff --git a/portal/static/css/slice-view.css b/portal/static/css/slice-view.css index 822d2cd2..304b757d 100644 --- a/portal/static/css/slice-view.css +++ b/portal/static/css/slice-view.css @@ -10,3 +10,6 @@ #complete-pending { background-color: #efffff; } +#complete-customize-resources { + background-color: #efdfdf; +}