Popup closes on submit

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

diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 242f5e5a6a0f910bc0b54c635f4b918e37f79536..e0a12ffbf63ab9e34286744dd867e99422510685 100644 (file)
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -1,42 +1,57 @@
 <% content_for :tab_line_buttons do %>
-<div class="pull-right">
+<div class="pull-right" style="width: 30%">
   <%= form_tag collections_path, method: 'get', remote: true, class: 'form-search' do %>
-  <div class="input-append">
-    <%= text_field_tag :search, params[:search], class: 'search-query' %>
-    <%= submit_tag "Search", name: nil, class: 'btn btn-info' %>
+  <div class="input-group">
+    <%= text_field_tag :search, params[:search], class: 'form-control', placeholder: 'Search collections' %>
+    <span class="input-group-btn">
+      <%= button_tag(class: 'btn btn-info') do %>
+      <span class="glyphicon glyphicon-search"></span>
+      <% end %>
+    </span>
   </div>  
   <% end %>
 </div>
 <% end %>
 
+<%= render partial: "paging", locals: {results: @collections, object: @object} %>
+
 <div style="padding-right: 1em">
 
-<table id="collections-index" class="topalign table table-condensed table-fixedlayout">
+<%= form_tag do |f| %>
+
+<table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
   <colgroup>
+    <col width="4%" />
     <col width="10%" />
     <col width="36%" />
-    <col width="22%" />
+    <col width="15%" />
     <col width="8%" />
-    <col width="16%" />
     <col width="8%" />
+    <col width="23%" />
   </colgroup>
   <thead>
     <tr class="contain-align-left">
+      <th></th>
       <th>uuid</th>
       <th>contents</th>
       <th>owner</th>
       <th>age</th>
-      <th>tags</th>
       <th>storage</th>
+      <th>tags</th>
     </tr>
   </thead>
   <tbody>
     <%= render partial: 'index_tbody' %>
   </tbody>
 </table>
+
+<% end %>
+
 </div>
 
-<% content_for :js do %>
+<%= render partial: "paging", locals: {results: @collections, object: @object} %>
+
+<% content_for :footer_js do %>
 $(document).on('click', 'form[data-remote] input[type=submit]', function() {
   $('table#collections-index tbody').fadeTo(200, 0.3);
   return true;