Work in progress

RaphaelGauthier · Aug 4, 2021 · 0692c60 · 0692c60
1 parent 1714f4d
commit 0692c60
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js b/webapp/sources/rudder/rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js
@@ -1429,12 +1429,12 @@ function createNodeTable(gridId, refresh) {
     dynColumns.sort()
     var table = $('#'+gridId).DataTable();
     $("#edit-columns").html($("<button class='btn btn-blue' > <i class='fa fa-pencil'></i> Edit columns</button>").click(function(){$("#select-columns").toggle()}))
-    var select = "<div class='col-xs-12 row form-group'> <div class='col-xs-2' style='margin-left : -15px'  > <select placeholder='Select column to add' class='  form-control'>"
+    var select = "<div class='form-inline-flex'> <div> <select placeholder='Select column to add' class='form-control'>"
     for (var key in dynColumns) {
       value = dynColumns[key]
       select += "<option value='"+value+"'>"+value+"</option>"
     }
-    select += "</select></div><div class='col-xs-2' style='margin-left : -15px'><input class='form-control' id='colValue' type='text'></div> <div class='col-xs-2' style='margin-left : -15px'><label><input id='colCheckbox' type='checkbox'> Show inherited properties</label></div> <button id='add-column' class='btn btn-success'  ><i class='fa fa-plus-circle'/> Add column</button>  <button id='reset-columns' class='btn btn-blue'  ><i class='fa fa-rotate-left' /> Reset columns</button></div>"
+    select += "</select></div><div><input class='form-control' id='colValue' type='text'></div><label for='colCheckbox' class='input-group'><span class='input-group-addon'><input id='colCheckbox' type='checkbox'></span><div class='form-control'>Show inherited properties</div></label><button id='add-column' class='btn btn-success'><i class='fa fa-plus-circle'></i>Add column</button><button id='reset-columns' class='btn btn-blue'><i class='fa fa-rotate-left'></i>Reset columns</button></div>"
     editOpen ? $("#select-columns").show() : $("#select-columns").hide()
     $("#select-columns").html(select)
     var selectedColumns =""

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-datatable.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-datatable.css
@@ -502,4 +502,15 @@ td.greyBackground, th.greyBackground {
 }
 .dataTable td a.text-danger:hover{
   color: #881c1a;
+}
+
+/* === COLUMNS CONFIGURATION === */
+#select-columns .rudder-label.label-error:before{
+  content: "";
+}
+#select-columns .form-inline-flex{
+  display: flex;
+}
+#select-columns .form-inline-flex > *:not(:first-child){
+  margin-left : 15px;
 }
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-menu.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-menu.css
@@ -1654,9 +1654,6 @@ form .tooltip-content p {
 .content-wrapper .rudder-label.label-error:before,.content-wrapper .label-text.label-error:after{
   content: "Error";
 }
-#select-columns .rudder-label.label-error:before{
-  content: "";
-}
 .content-wrapper .rudder-label.label-error + .tooltip b, .content-wrapper .label-text.label-error:after, .content-wrapper .label-text.label-error  + .tooltip b, .text-Error{
   color: #C00804;
 }