Merge branch '12934-cwl-conformance' refs #12934

[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 ef782d6158d93239c78404142b8b73ed53040062..6f1e062335f55882319c8dfdee812a6bf3bc79d6 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
@@ -26,15 +26,18 @@ SPDX-License-Identifier: AGPL-3.0 %>
            value="<%= params[:search] %>" />
   </div>
 
+  <p>
+    <b>Note:</b> Projects which are a subproject of a trashed project are only shown when searching the trash.
+  </p>
+
   <div>
     <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,10 +45,9 @@ 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></th>
+          <th>Parent project</th>
+          <th>Date&nbsp;trashed&nbsp;/<br />to&nbsp;be&nbsp;deleted</th>
+          <th>UUID</th>
           <th></th>
         </tr>
       </thead>