From: Loic Baron Date: Fri, 11 Oct 2013 15:28:57 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice X-Git-Tag: myslice-0.2-5~14 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5a98d2bbf3603206e4574783633342ddcbbd4943;hp=1f6ce9338dcd613e06724e4ac2dcb0bb433209a2;p=myslice.git Merge branch 'master' of ssh://git.onelab.eu/git/myslice --- diff --git a/plugins/query_editor/static/css/query_editor.css b/plugins/query_editor/static/css/query_editor.css index a5161f97..4061d0f8 100644 --- a/plugins/query_editor/static/css/query_editor.css +++ b/plugins/query_editor/static/css/query_editor.css @@ -1,7 +1,10 @@ +div.query-editor-spacer { + padding: 15px 5px; +} + table.query-editor { width: 95%; -/* what is going on in there ? */ -/* border: 1px solid #ff0000; */ + padding-bottom: 10px; } /* Add a scrollbar to autocomplete fields */ diff --git a/plugins/query_editor/templates/query_editor.html b/plugins/query_editor/templates/query_editor.html index c7f3dd0c..972015ae 100644 --- a/plugins/query_editor/templates/query_editor.html +++ b/plugins/query_editor/templates/query_editor.html @@ -7,7 +7,7 @@ EOF; EOF; --> -
+
diff --git a/portal/sliceview.py b/portal/sliceview.py index 7c77f1f8..a4efdbd1 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -149,6 +149,7 @@ class SliceView (LoginRequiredAutoLogoutView): page = page, query = query_resource_all, title = "Select Columns", + domid = 'select-columns', ) resources_active_filters = ActiveFilters( page = page,