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 a5161f9..4061d0f 100644 (file)
--- 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 c7f3dd0..972015a 100644 (file)
--- a/plugins/query_editor/templates/query_editor.html
+++ b/plugins/query_editor/templates/query_editor.html
@@ -7,7 +7,7 @@ EOF;
 
 EOF; -->
 
-<div>
+<div class='query-editor-spacer'>
   <table id='{{domid}}__table' class='query-editor'>
     <thead>
       <tr>

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 7c77f1f..a4efdbd 100644 (file)
--- 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,