3706: Merge branch 'master' into 3706-keep-warning

[arvados.git] / apps / workbench / app / views / collections / _show_files.html.erb

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 805591349a3413a6159fbee664549cc50ecf9c0a..9cd77b02e1a51a21c05291a5907699fb88aa24fd 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -17,10 +17,14 @@
         </ul>
       </div>
     </div>
-    <div class="pull-right">
+    <div class="pull-right col-lg-3">
       <%= form_tag collection_path(@object.uuid), {method: 'get'} do %>
-        <input class="form-control" id="file_regex" name="file_regex" placeholder="regular expression" value="<%= params[:file_regex] %>" type="text"/>
-        <button id="file_regex_submit" type="submit" class="btn btn-primary" autofocus>Filter</button>
+        <div class="input-group">
+          <input class="form-control" id="file_regex" name="file_regex" placeholder="regular expression" value="<%= params[:file_regex] %>" type="text"/>
+          <span class="input-group-btn">
+            <button id="file_regex_submit" type="submit" class="btn btn-primary" autofocus>Filter</button>
+          </span>
+        </div>
       <% end %>
     </div>
   </div>
@@ -51,7 +55,7 @@
   <% file_tree.reject { |(dirname, filename, size)|
        # Eliminate any files that don't match file_regex
        # (or accept all files if no file_regex was given)
-       file_regex and !file_regex.match(filename)
+       size and file_regex and !file_regex.match(filename)
        }
        .take(10000)
        .each_with_index do |(dirname, filename, size), index| %>