[ARVADOS] updated: 88abf688d7545fc663e0422f0c586107d4c56e5a

[Git user]

Summary of changes:
 apps/workbench/app/assets/images/trash-icon.png         | Bin 0 -> 18381 bytes
 .../app/views/application/_breadcrumbs.html.erb         |   2 +-
 .../app/views/trash_items/_show_trash_items.html.erb    |   6 ++++--
 .../app/views/trash_items/_show_trash_rows.html.erb     |   3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 apps/workbench/app/assets/images/trash-icon.png

       via  88abf688d7545fc663e0422f0c586107d4c56e5a (commit)
      from  6c40c1c5b000b2eb0967df0f7ebaf613393501bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 88abf688d7545fc663e0422f0c586107d4c56e5a
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 1 14:05:46 2017 -0400

    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
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 71af8de..2db43ed 100644
--- 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 af48990..153d7d0 100644
--- 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 0d433bf..d617d8d 100644
--- a/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trash_rows.html.erb
@@ -13,6 +13,9 @@
         <%= 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] %>
           <% file_path = "#{file[0]}/#{file[1]}" %>

-----------------------------------------------------------------------


hooks/post-receive
--