9587: include "owner" in trash rows; update trash icon.

diff --git a/apps/workbench/app/assets/images/trash-icon.png b/apps/workbench/app/assets/images/trash-icon.png
new file mode 100644 (file)
index 0000000..5c26c24
Binary files /dev/null and b/apps/workbench/app/assets/images/trash-icon.png differ

diff --git a/apps/workbench/app/views/application/_breadcrumbs.html.erb b/apps/workbench/app/views/application/_breadcrumbs.html.erb
index 71af8de7f167418cc2cf50997b92c950fef5f07e..2db43eda6251ceee56356ff71ba3fc00e07ca616 100644 (file)
--- a/apps/workbench/app/views/application/_breadcrumbs.html.erb
+++ b/apps/workbench/app/views/application/_breadcrumbs.html.erb
@@ -69,7 +69,7 @@
         <ul class="nav navbar-nav navbar-right">
           <li>
             <a href="/trash">
-              <i class="fa fa-lg fa-fw fa-trash-o"></i>Trash
+              <%= image_tag("trash-icon.png", size: "19x19" ) %> Trash
             </a>
           </li>
         </ul>

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 af4899047a902de7f897b0eeec85e6221aa1b0dc..153d7d033397d93d58dddb7fba1c022c5ea5b20b 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
@@ -27,8 +27,9 @@
       <colgroup>
         <col width="5%" />
         <col width="20%" />
-        <col width="15%" />
-        <col width="15%" />
+        <col width="10%" />
+        <col width="10%" />
+        <col width="10%" />
         <col width="40%" />
         <col width="5%" />
       </colgroup>
@@ -39,6 +40,7 @@
           <th>Name</th>
           <th>Created at</th>
           <th>Trashed at</th>
+          <th>Owner</th>
           <th>Contents</th>
           <th></th>
         </tr>

diff --git a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
index 0d433bf2044290d6e40ef15a7097a412d141ca35..d617d8d2ea0c4a139daa00f45db6eb2e74387421 100644 (file)
--- a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
@@ -12,6 +12,9 @@
       <td>
         <%= obj.trash_at.to_s if obj.trash_at %>
       </td>
+      <td>
+        <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
+      </td>
       <td>
         <% for i in (0..[2, obj.files.length-1].min) %>
           <% file = obj.files[i] %>