9587: cleanup trashed_items method

[arvados.git] / apps / workbench / app / views / trash_items / _show_trash_items.html.erb

diff --git a/apps/workbench/app/views/trash_items/_show_trash_items.html.erb b/apps/workbench/app/views/trash_items/_show_trash_items.html.erb
index 2b777fafd717fa45813b1994ff8dd5337cf579d2..af4899047a902de7f897b0eeec85e6221aa1b0dc 100644 (file)
--- a/apps/workbench/app/views/trash_items/_show_trash_items.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trash_items.html.erb
@@ -1,19 +1,21 @@
-<div class="container">
-  <div class="col-md-6 pull-left">
+<div class="container selection-action-container" style="width: 100%">
+  <div class="col-md-2 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 "Un-trash selected items", '#',
                 method: :post,
+                remote: true,
+                'id' => 'untrash_selected_items',
                 'data-href' => untrash_items_trash_items_path,
                 'data-selection-param-name' => 'selection[]',
-                'data-selection-action' => 'untrash-items',
+                'data-selection-action' => 'untrash-selected-items',
                 'data-toggle' => 'dropdown'
           %></li>
       </ul>
     </div>
   </div>
-  <div class="col-md-6 pull-right">
+  <div class="col-md-4 pull-right">
     <input type="text" class="form-control filterable-control recent-trash-items"
            placeholder="Search trash"
            data-filterable-target="#recent-trash-items"
@@ -24,11 +26,10 @@
     <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
       <colgroup>
         <col width="5%" />
+        <col width="20%" />
         <col width="15%" />
-        <col width="10%" />
-        <col width="10%" />
-        <col width="30%" />
-        <col width="25%" />
+        <col width="15%" />
+        <col width="40%" />
         <col width="5%" />
       </colgroup>
 
@@ -39,7 +40,6 @@
           <th>Created at</th>
           <th>Trashed at</th>
           <th>Contents</th>
-          <th>Tags</th>
           <th></th>
         </tr>
       </thead>