From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Tue, 15 Apr 2014 14:02:02 +0000 (-0400)
Subject: Merge branch 'master' into 1971-show-image-thumbnails
X-Git-Tag: 1.1.0~2710
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7a98271d94163cdc4afa5bfcf275db353bc062d2?hp=bb45025e80abc00f8da524d9a78c0bab976d4f3a

Merge branch 'master' into 1971-show-image-thumbnails

Conflicts:
	apps/workbench/app/views/collections/_show_files.html.erb
---

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 956958eddb..a56e885336 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,3 +1,10 @@
+<% content_for :css do %>
+.file-list-inline-image {
+  width: 50%;
+  height: auto;
+}
+<% end %>
+
 <table class="table table-condensed table-fixedlayout">
   <colgroup>
     <col width="4%" />
@@ -24,19 +31,25 @@
       <tr>
         <td>
           <%= check_box_tag 'uuids[]', @object.uuid+'/'+file_path, false, {
-                :class => 'persistent-selection', 
+                :class => 'persistent-selection',
                 :friendly_type => "File",
                 :friendly_name => "#{@object.uuid}/#{file_path}",
-                :href => "#{url_for controller: 'collections', action: 'show', id: @object.uuid }/#{file_path}" 
+                :href => "#{url_for controller: 'collections', action: 'show', id: @object.uuid }/#{file_path}"
               } %>
         </td>
         <td>
           <%= file[0] %>
         </td>
 
-        <td>
-          <%= 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>
+        <%= link_to((if /\.(jpg|jpeg|gif|png|svg)$/i.match(file[1]) then
+                       image_tag "#{url_for @object}/#{file_path}", class: "file-list-inline-image"
+                     else
+                       file[1]
+                     end),
+                    {controller: 'collections', action: 'show_file', uuid: @object.uuid, file: file_path, size: file[2], disposition: 'inline'},
+                    {title: file_path}) %>
+      </td>
 
         <td style="text-align:right">
           <%= raw(human_readable_bytes_html(file[2])) %>