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

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

diff --cc apps/workbench/app/views/collections/_show_files.html.erb
index 15daaf7e2ddac111f205dc566c399867fe671eda,956958eddb9fe0785946eb7a36bd0f866e00996e..a56e8853360da4b3aae690571cdd3a3a60eaaf2a
--- 1/apps/workbench/app/views/collections/_show_files.html.erb
--- 2/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@@ -1,10 -1,3 +1,10 @@@
-   height: auto; 
 +<% content_for :css do %>
 +.file-list-inline-image {
 +  width: 50%;
++  height: auto;
 +}
 +<% end %>
 +
  <table class="table table-condensed table-fixedlayout">
    <colgroup>
      <col width="4%" />
@@@ -23,42 -16,38 +23,44 @@@
      </tr>
    </thead><tbody>
      <% if @object then @object.files.sort_by{|f|[f[0],f[1]]}.each do |file| %>
-     <% file_path = "#{file[0]}/#{file[1]}" %>
-     <tr>
-       <td>
-         <% fp2 = file_path[2..-1] if file_path[0..1] == './' %>
-         <% fp2 ||= file_path %>
- <%= check_box_tag 'uuids[]', @object.uuid+file_path, false, {
-   :class => 'persistent-selection', 
-   :friendly_type => "File",
-   :friendly_name => "#{@object.uuid}/#{fp2}",
-   :href => "#{url_for controller: 'collections', action: 'show', id: @object.uuid }/#{file_path}" 
-       } %>
-       </td>
-       <td>
-         <%= file[0] %>
-       </td>
+       <% f0 = file[0] %>
+       <% f0 = '' if f0 == '.' %>
+       <% f0 = f0[2..-1] if f0[0..1] == './' %>
+       <% f0 += '/' if not f0.empty? %>
+       <% file_path = "#{f0}#{file[1]}" %>
+       <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'}, 
++                     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])) %>
-       </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>
+         <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>
  </table>