Merge branch 'master' into 3654-combine-selections

[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 125f413a9d1f1b6de1f69ea227de4301790cf00e..9573f6e8a8014dc0e46bf6f21ffcd35033022898 100644 (file)
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -1,48 +1,61 @@
-<% content_for :tab_line_buttons do %>
-<div class="pull-right" style="width: 30%">
-  <%= form_tag collections_path, method: 'get', remote: true, class: 'form-search' do %>
-  <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>  
+<div class="selection-action-container" style="padding-left: 1em">
+  <div class="row">
+    <div class="pull-left">
+      <div class="btn-group btn-group-sm">
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
+        <ul class="dropdown-menu" role="menu">
+          <li><%= link_to "Combine selections into a new collection", '/combine_selected',
+                  'data-href' => url_for('/combine_selected'),
+                  'data-selection-param-name' => 'selection[]',
+                  'data-selection-action' => 'combine',
+                  'data-remote' => true,
+                  'data-toggle' => 'dropdown'
+            %></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+  <p/>
+
+  <%= render partial: "paging", locals: {results: @collections, object: @object} %>
+
+  <div style="padding-right: 1em">
+
+  <%= form_tag do |f| %>
+
+  <table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
+    <colgroup>
+      <col width="10%" />
+      <col width="10%" />
+      <col width="40%" />
+      <col width="10%" />
+      <col width="30%" />
+    </colgroup>
+    <thead>
+      <tr class="contain-align-left">
+        <th></th>
+        <th>uuid</th>
+        <th>contents</th>
+        <th>created at</th>
+        <th>tags</th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render partial: 'index_tbody' %>
+    </tbody>
+  </table>
+
   <% end %>
-</div>
-<% end %>
-
-<div style="padding-right: 1em">
-
-<table id="collections-index" class="topalign table table-condensed table-fixedlayout table-fixed-header-row">
-  <colgroup>
-    <col width="10%" />
-    <col width="36%" />
-    <col width="22%" />
-    <col width="8%" />
-    <col width="16%" />
-    <col width="8%" />
-  </colgroup>
-  <thead>
-    <tr class="contain-align-left">
-      <th>uuid</th>
-      <th>contents</th>
-      <th>owner</th>
-      <th>age</th>
-      <th>tags</th>
-      <th>storage</th>
-    </tr>
-  </thead>
-  <tbody>
-    <%= render partial: 'index_tbody' %>
-  </tbody>
-</table>
-</div>
 
-<% 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;
-});
-<% end %>
+  </div>
+
+  <%= 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;
+  });
+  <% end %>
+
+</div>