12125: Adjust table layout

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

Reviewed-by: Peter Amstutz <peter.amstutz@curoverse.com>

diff --git a/apps/workbench/app/views/trash_items/_show_trashed_collections.html.erb b/apps/workbench/app/views/trash_items/_show_trashed_collections.html.erb
index aaa29360f5b30da5193ca51f817004418512cd3e..0cb941c5ba3f9d68529d0df79d2d930b45433d5c 100644 (file)
--- a/apps/workbench/app/views/trash_items/_show_trashed_collections.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trashed_collections.html.erb
@@ -43,7 +43,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
           <th></th>
           <th>Name</th>
           <th>Date&nbsp;trashed&nbsp;/<br />to&nbsp;be&nbsp;deleted</th>
-          <th>Owner</th>
+          <th>Parent project</th>
           <th>UUID&nbsp;/<br />Content&nbsp;address&nbsp;(PDH)</th>
           <th>Contents</th>
           <th></th>

diff --git a/apps/workbench/app/views/trash_items/_show_trashed_project_rows.html.erb b/apps/workbench/app/views/trash_items/_show_trashed_project_rows.html.erb
index 1937bcf16906453d049ea8a1873b557c81367193..ef3a478a0bde1d747dc3c1b066244fb10386c933 100644 (file)
--- a/apps/workbench/app/views/trash_items/_show_trashed_project_rows.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trashed_project_rows.html.erb
@@ -3,7 +3,7 @@
 SPDX-License-Identifier: AGPL-3.0 %>
 
 <% @objects.each do |obj| %>
-    <tr data-object-uuid="<%= obj.uuid %>" data-kind="<%= obj.kind %>" >
+  <tr data-object-uuid="<%= obj.uuid %>" data-kind="<%= obj.kind %>" >
       <td>
         <% if obj.editable? %>
           <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection', style: 'cursor: pointer;' %>
@@ -11,16 +11,21 @@ SPDX-License-Identifier: AGPL-3.0 %>
       </td>
       <td>
         <%= if !obj.name.blank? then obj.name else obj.uuid end %>
+      </td>
       <td>
-        <%= render_localized_date(obj.trash_at) if obj.trash_at %>
-      <td>
-        <%= render_localized_date(obj.delete_at) if obj.delete_at %>
+        <% if obj.trash_at %>
+          <%= render_localized_date(obj.trash_at)  %>
+        <% end %>
+        <br />
+        <% if obj.delete_at %>
+          <%= render_localized_date(obj.delete_at) %>
+        <% end %>
       </td>
       <td>
         <%= link_to_if_arvados_object obj.owner_uuid, friendly_name: true %>
       </td>
       <td>
-
+        <%= obj.uuid %>
       </td>
       <td>
         <%= render partial: 'untrash_item', locals: {object:obj} %>

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 ef782d6158d93239c78404142b8b73ed53040062..2882814d949524b47772f3ea8b8442f754b1d990 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
@@ -29,23 +29,21 @@ SPDX-License-Identifier: AGPL-3.0 %>
   <div>
     <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
       <colgroup>
-        <col width="5%" />
-        <col width="20%" />
-        <col width="15%" />
-        <col width="15%" />
         <col width="10%" />
-        <col width="30%" />
-        <col width="5%" />
+        <col width="21%" />
+        <col width="21%" />
+        <col width="21%" />
+        <col width="21%" />
+        <col width="6%" />
       </colgroup>
 
       <thead>
         <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></th>
+          <th>Date&nbsp;trashed&nbsp;/<br />to&nbsp;be&nbsp;deleted</th>
+          <th>Parent project</th>
+          <th>UUID</th>
           <th></th>
         </tr>
       </thead>