Merge branch 'master' of git.clinicalfuture.com:arvados

[arvados.git] / 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 34d24411f6d3ee218f98345177bd5c0a0db96908..4b63162be0550f32a4e74ca636739fc27149b286 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,3 +1,22 @@
+<% content_for :css do %>
+.file-list-inline-image {
+  width: 50%;
+  height: auto;
+}
+<% end %>
+
+<% content_for :tab_line_buttons do %>
+<div class="row">
+  <div class="col-md-6"></div>
+  <div class="col-md-6">
+    <div class="pull-right">
+      Collection storage status:
+      <%= render partial: 'toggle_persist', locals: { uuid: @object.uuid, current_state: (@is_persistent ? 'persistent' : 'cache') } %>
+    </div>
+  </div>
+</div>
+<% end %>
+
 <table class="table table-condensed table-fixedlayout">
   <colgroup>
     <col width="4%" />
@@ -16,11 +35,7 @@
     </tr>
   </thead><tbody>
     <% if @object then @object.files.sort_by{|f|[f[0],f[1]]}.each do |file| %>
-      <% f0 = file[0] %>
-      <% f0 = '' if f0 == '.' %>
-      <% f0 = f0[2..-1] if f0[0..1] == './' %>
-      <% f0 += '/' if not f0.empty? %>
-      <% file_path = "#{f0}#{file[1]}" %>
+      <% file_path = CollectionsHelper::file_path file %>
       <tr>
         <td>
           <%= check_box_tag 'uuids[]', @object.uuid+'/'+file_path, false, {
@@ -35,9 +50,15 @@
           <%= 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 CollectionsHelper::is_image file[1]
+                       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])) %>