9587: display name instead of clickable link and remove tags

diff --git a/apps/workbench/app/views/application/_breadcrumbs.html.erb b/apps/workbench/app/views/application/_breadcrumbs.html.erb
index 489dbf32b5d979a8eeec6649dce7425cf24f1b48..1af3ddc0fbb89ed9171ce45f9c21fdf470b46374 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>
+              <i class="fa fa-lg fa-fw fa-trash-o" style="padding-right: 1em"></i>
             </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 dc615fc9ab55a4eccdcea5fe03691cdc8c27dbad..af4899047a902de7f897b0eeec85e6221aa1b0dc 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
@@ -1,5 +1,5 @@
-<div class="container selection-action-container">
-  <div class="col-md-6 pull-left">
+<div class="container selection-action-container" style="width: 100%">
+  <div class="col-md-2 pull-left">
     <div class="btn-group btn-group-sm">
       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
@@ -15,7 +15,7 @@
       </ul>
     </div>
   </div>
-  <div class="col-md-6 pull-right">
+  <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"
@@ -26,11 +26,10 @@
     <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
       <colgroup>
         <col width="5%" />
+        <col width="20%" />
         <col width="15%" />
-        <col width="10%" />
-        <col width="10%" />
-        <col width="30%" />
-        <col width="25%" />
+        <col width="15%" />
+        <col width="40%" />
         <col width="5%" />
       </colgroup>
 
@@ -41,7 +40,6 @@
           <th>Created at</th>
           <th>Trashed at</th>
           <th>Contents</th>
-          <th>Tags</th>
           <th></th>
         </tr>
       </thead>

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 73b89dd5493c8a45dcc1c8030d7d0c4fb1f5b127..7e01e3d0fe8798b8d486cdd2bd2bfe754a611bd4 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
@@ -4,7 +4,7 @@
         <%= check_box_tag 'uuids[]', obj.uuid, false, :class => 'persistent-selection' %>
       </td>
       <td>
-        <%= link_to_if_arvados_object obj, friendly_name: true %>
+        <%= if !obj.name.blank? then obj.name else obj.uuid end %>
       <td>
         <%= obj.created_at.to_s if obj.created_at %>
       <td>
@@ -12,26 +12,16 @@
       </td>
       <td>
         <% i = 0 %>
-        <% while i < 3 and i < obj.files.length %>
+        <% while i < 5 and i < obj.files.length %>
           <% file = obj.files[i] %>
           <% file_path = "#{file[0]}/#{file[1]}" %>
-          <%= link_to file[1], {controller: 'collections', action: 'show_file', uuid: obj.uuid, file: file_path, size: file[2], disposition: 'inline'}, {title: 'View in browser'} %><br />
+          <%= file_path %><br />
           <% i += 1 %>
         <% end %>
         <% if i < obj.files.length %>
-          &vellip;
+          &hellip;
         <% end %>
       </td>
-      <td>
-        <span class="tag-container">
-        <% if @collection_info[obj.uuid] %>
-          <% @collection_info[obj.uuid][:tag_links].each do |tag_link| %>
-            <span class="label label-info" data-tag-link-uuid="<%= tag_link.uuid %>"><%= tag_link.name %>
-            </span>&nbsp;
-          <% end %>
-        <% end %>
-        </span>
-      </td>
       <td>
         <%= render partial: 'untrash_item', locals: {object:obj} %>
       </td>

diff --git a/apps/workbench/app/views/work_units/_show_all_processes.html.erb b/apps/workbench/app/views/work_units/_show_all_processes.html.erb
index ea178438cfef1fe912bed6f22ec5a5f54bb9b6b2..0fc1ef625f4d96dbd7470abbbe13a7c439dd150a 100644 (file)
--- a/apps/workbench/app/views/work_units/_show_all_processes.html.erb
+++ b/apps/workbench/app/views/work_units/_show_all_processes.html.erb
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container" style="width: 100%">
   <div class="row">
     <div class="pull-right">
       <input type="text" class="form-control filterable-control recent-all-processes-filterable-control"