4363: Merge branch 'master' into 4363-less-filename-munging

[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 d624749a4a1e4a9645ee678e61b3594e0db3f7e5..6ebb3b2a28e67632b134959e612be7fa8c319637 100644 (file)
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -1,4 +1,23 @@
-<%= render partial: "paging", locals: {results: @collections, object: @object} %>
+<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 "Create new collection with selected collections", '#',
+                  'data-href' => combine_selected_path,
+                  'data-selection-param-name' => 'selection[]',
+                  'data-selection-action' => 'combine-collections',
+                  'method' => 'post',
+                  'data-toggle' => 'dropdown'
+            %></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+  <p/>
+
+<%= render partial: "paging", locals: {results: @objects, object: @object} %>
 
 <div style="padding-right: 1em">
 
@@ -6,12 +25,11 @@
 
 <table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
   <colgroup>
-    <col width="8%" />
     <col width="10%" />
-    <col width="34%" />
-    <col width="11%" />
-    <col width="12%" />
-    <col width="29%" />
+    <col width="10%" />
+    <col width="40%" />
+    <col width="10%" />
+    <col width="30%" />
   </colgroup>
   <thead>
     <tr class="contain-align-left">
@@ -19,7 +37,6 @@
       <th>uuid</th>
       <th>contents</th>
       <th>created at</th>
-      <th>storage</th>
       <th>tags</th>
     </tr>
   </thead>
@@ -32,7 +49,7 @@
 
 </div>
 
-<%= render partial: "paging", locals: {results: @collections, object: @object} %>
+<%= render partial: "paging", locals: {results: @objects, object: @object} %>
 
 <% content_for :footer_js do %>
 $(document).on('click', 'form[data-remote] input[type=submit]', function() {
@@ -40,3 +57,5 @@ $(document).on('click', 'form[data-remote] input[type=submit]', function() {
   return true;
 });
 <% end %>
+
+</div>