Merge pull request #2370 from biosistemika/ai-sci-add-container-for-repository-filters

Small fixes

app/assets/javascripts/repositories/repository_datatable.js

@@ -547,6 +547,9 @@ var RepositoryDatatable = (function(global) {
         $('div.toolbarButtonsDatatable').appendTo('div.toolbar');
         $('div.toolbarButtonsDatatable').show();
 
+        $('div.toolbar-filter-buttons').prependTo('div.filter-container');
+        $('div.toolbar-filter-buttons').show();
+
         // Append buttons for task inventory
         $('div.toolbarButtons').appendTo('div.toolbar');
         $('div.toolbarButtons').show();
@@ -613,6 +616,11 @@ var RepositoryDatatable = (function(global) {
 
     initRowSelection();
     bindExportActions();
+    $(window).resize(() => {
+      setTimeout(() => {
+        adjustTableHeader();
+      }, 500);
+    });
 
     return TABLE;
   }

app/assets/javascripts/repository_columns/index.js

@@ -24,6 +24,9 @@ var RepositoryColumns = (function() {
     $('div.toolbarButtonsDatatable').appendTo('.repository-show');
     $('div.toolbarButtonsDatatable').hide();
 
+    $('div.toolbar-filter-buttons').appendTo('.repository-show');
+    $('div.toolbar-filter-buttons').hide();
+
     // destroy datatable and remove partial
     TABLE.destroy();
     $('.repository-table').remove();

app/assets/javascripts/sitewide/perfect_scrollbar.js

@@ -4,9 +4,9 @@ var activePSB = [];
 
 var PerfectSb = (function() {
   function init() {
+    activePSB.length = 0;
     $.each($('.perfect-scrollbar'), function(index, object) {
       var ps;
-      activePSB.length = 0;
       ps = new PerfectScrollbar(object, { wheelSpeed: 0.5, minScrollbarLength: 20 });
       activePSB.push(ps);
     });

app/assets/stylesheets/repositories.scss

@@ -108,6 +108,10 @@
 
     .filter-container {
       flex-grow: 1;
+
+      .toolbar-filter-buttons {
+        float: right;
+      }
     }
   }
 

app/assets/stylesheets/shared_styles/elements/input_fields.scss

@@ -36,7 +36,7 @@
     line-height: 36px;
     position: absolute;
     text-align: center;
-    top: 0;
+    bottom: 0;
     width: 25px;
   }
 
@@ -80,6 +80,10 @@
       border: $border-danger;
     }
 
+    .fas {
+      bottom: 6px;
+    }
+
     &::before {
       @include font-small;
       bottom: -9px;

app/assets/stylesheets/shared_styles/elements/radio_buttons.scss

@@ -4,6 +4,13 @@
   --sci-radio-size: 16px;
 }
 
+.sci-radio-container {
+  display: inline-block;
+  height: var(--sci-radio-size);
+  position: relative;
+  width: var(--sci-radio-size);
+}
+
 input[type="radio"].sci-radio {
   cursor: pointer;
   flex-shrink: 0;
@@ -18,8 +25,8 @@ input[type="radio"].sci-radio {
     display: inline-block;
     flex-shrink: 0;
     height: var(--sci-radio-size);
-    margin-left: calc((var(--sci-radio-size) * -1) - 3px);
-    position: relative;
+    left: 0;
+    position: absolute;
     width: var(--sci-radio-size);
 
     &::before {
@@ -34,7 +41,6 @@ input[type="radio"].sci-radio {
       line-height: calc(var(--sci-radio-size) - 2px);
       position: absolute;
       text-align: center;
-      top: 1px;
       transition: .2s;
       width: var(--sci-radio-size);
     }
@@ -48,7 +54,7 @@ input[type="radio"].sci-radio {
       height: calc(var(--sci-radio-size) - 6px);
       left: 3px;
       position: absolute;
-      top: 4px;
+      top: 3px;
       transition: .2s;
       width: calc(var(--sci-radio-size) - 6px);
     }

app/views/repositories/show.html.erb

@@ -106,6 +106,9 @@
   </div>
 
   <!-- These buttons are appended to table in javascript, after table initialization -->
+  <div class="toolbar-filter-buttons" style="display:none">
+  </div>
+
   <div class="toolbarButtonsDatatable" style="display:none">
 
     <% if can_create_repository_rows?(@repository) %>