12125: Can search within trashed projects.

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

diff --git a/apps/workbench/app/views/trash_items/_show_trashed_projects.html.erb b/apps/workbench/app/views/trash_items/_show_trashed_projects.html.erb
index a78b02fcb10c202876add3e9b7dddecad8fecbcd..ced1990ad6ec51c8e9a90638e183a3a54f9f96aa 100644 (file)
--- a/apps/workbench/app/views/trash_items/_show_trashed_projects.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trashed_projects.html.erb
@@ -22,7 +22,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
   <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"
+           data-filterable-target="#recent-project-trash-items"
            value="<%= params[:search] %>" />
   </div>
 
@@ -30,11 +30,10 @@ SPDX-License-Identifier: AGPL-3.0 %>
     <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
       <colgroup>
         <col width="5%" />
+        <col width="16%" />
+        <col width="25%" />
         <col width="20%" />
-        <col width="15%" />
-        <col width="15%" />
-        <col width="10%" />
-        <col width="30%" />
+        <col width="29%" />
         <col width="5%" />
       </colgroup>
 
@@ -42,16 +41,15 @@ SPDX-License-Identifier: AGPL-3.0 %>
         <tr class="contain-align-left">
           <th></th>
           <th>Name</th>
-          <th>Trashed at</th>
-          <th title="After this time, no longer available to be recovered from Trash">Permanently<br/>Deleted At</th>
-          <th>Owner</th>
-          <th>Contents</th>
+          <th>Parent project</th>
+          <th>Date&nbsp;trashed&nbsp;/<br />to&nbsp;be&nbsp;deleted</th>
+          <th>UUID</th>
           <th></th>
         </tr>
       </thead>
 
-      <tbody data-infinite-scroller="#recent-trash-items" id="recent-trash-items"
-        data-infinite-content-href="<%= url_for partial: :trash_rows %>" >
+      <tbody data-infinite-scroller="#recent-project-trash-items" id="recent-project-trash-items"
+        data-infinite-content-href="<%= url_for partial: :trashed_project_rows %>" >
       </tbody>
     </table>
   </div>