Clean up collections index and show->files tables.

diff --git a/apps/workbench/app/views/application/_show_recent.html.erb b/apps/workbench/app/views/application/_show_recent.html.erb
index 86b6b049f9cfd54df064b247fe051143a79d2f9a..9028c6abee4aeccf3530a500c68a86ac904105a6 100644 (file)
--- a/apps/workbench/app/views/application/_show_recent.html.erb
+++ b/apps/workbench/app/views/application/_show_recent.html.erb
@@ -8,7 +8,7 @@
 
 <% attr_blacklist = ' created_at modified_at modified_by_user_uuid modified_by_client_uuid updated_at' %>
 
-<table class="table arv-index">
+<table class="table table-condensed arv-index">
   <thead>
     <tr>
       <% @objects.first.attributes_for_display.each do |attr, attrvalue| %>

diff --git a/apps/workbench/app/views/collections/_index_tbody.html.erb b/apps/workbench/app/views/collections/_index_tbody.html.erb
index b41234505e2e576ff1a3ea3c581456ea7da0612a..9252886bb2094cf05ee6819ce9dbab290471d16b 100644 (file)
--- a/apps/workbench/app/views/collections/_index_tbody.html.erb
+++ b/apps/workbench/app/views/collections/_index_tbody.html.erb
@@ -16,7 +16,7 @@
       ⋮
     <% end %>
   </td>
-  <td><%= render partial: 'application/arvados_attr_value', locals: { obj: c, attr: "owner_uuid", attrvalue: c.owner_uuid } %></td>
+  <td><%= link_to_if_arvados_object c.owner_uuid, friendly_name: true %></td>
   <td>
     <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about ','~').sub(' ','&nbsp;')) if c.created_at %>
   </td>

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 991c92d746c8797679bd26ea44a32693f7b6dd50..ca694d2c47488b106cb80b80cbddccf2449010b4 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,10 +1,16 @@
-<table class="table table-bordered" style="table-layout: fixed">
+<table class="table table-condensed table-fixedlayout">
+  <colgroup>
+    <col width="35%" />
+    <col width="40%" />
+    <col width="15%" />
+    <col width="10%" />
+  </colgroup>
   <thead>
     <tr>
       <th>path</th>
       <th>file</th>
-      <th style="width: 3em">d/l</th>
-      <th style="width: 7em; text-align:right">size</th>
+      <th style="text-align:right">size</th>
+      <th>d/l</th>
     </tr>
   </thead><tbody>
     <% if @object then @object.files.sort_by{|f|f[1]}.each do |file| %>
@@ -18,16 +24,15 @@
         <%= link_to file[1], {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'inline'}, {title: 'View in browser'} %>
       </td>
 
-      <td>
-        <div style="display:inline-block">
-          <%= link_to raw('<i class="glyphicon glyphicon-download"></i>'), {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'attachment'}, {class: 'label label-info', title: 'Download'} %>
-        </div>
-      </td>
-
       <td style="text-align:right">
         <%= raw(human_readable_bytes_html(file[2])) %>
       </td>
 
+      <td>
+        <div style="display:inline-block">
+          <%= link_to raw('<i class="glyphicon glyphicon-download-alt"></i>'), {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'attachment'}, {class: 'btn btn-info btn-sm', title: 'Download'} %>
+        </div>
+      </td>
     </tr>
     <% end; end %>
   </tbody>

diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 619420269e4b4df13ba5db60ecc2678350cffb96..242f5e5a6a0f910bc0b54c635f4b918e37f79536 100644 (file)
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -11,7 +11,7 @@
 
 <div style="padding-right: 1em">
 
-<table id="collections-index" class="topalign table table-bordered table-condensed table-fixedlayout table-smallcontent">
+<table id="collections-index" class="topalign table table-condensed table-fixedlayout">
   <colgroup>
     <col width="10%" />
     <col width="36%" />