Merge branch 'master' into 4487-and-4558

[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 8af66ad59a8bf34ae779ec3db5fdbd5e25ed90dc..39a1b36c3180c5415cd6782ee8a9d081daa864d6 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -19,7 +19,18 @@ function unselect_all_files() {
 }
 </script>
 
-<div class="selection-action-container" style="padding-left: 1em">
+<%
+  preview_selectable_container = ''
+  preview_selectable = ''
+  padding_left = '1em'
+  if !params['use_preview_selection'].nil? and params['use_preview_selection'] == 'true'
+    preview_selectable_container = 'preview-selectable-container selectable-container'
+    preview_selectable = 'preview-selectable selectable'
+    padding_left = '0em'
+  end
+%>
+
+<div class="selection-action-container" style="padding-left: <%=padding_left%>">
   <% if !defined? no_checkboxes or !no_checkboxes %>
   <div class="row">
     <div class="pull-left">
@@ -53,14 +64,6 @@ function unselect_all_files() {
 <% if file_tree.nil? or file_tree.empty? %>
   <p>This collection is empty.</p>
 <% else %>
-  <%
-    preview_selectable_container = ''
-    preview_selectable = ''
-    if !params['use_preview_selection'].nil? and params['use_preview_selection'] == 'true'
-      preview_selectable_container = 'preview-selectable-container selectable-container'
-      preview_selectable = 'preview-selectable selectable'
-    end
-  %>
   <ul id="collection_files" class="collection_files <%=preview_selectable_container%>">
   <% dirstack = [file_tree.first.first] %>
   <% file_tree.take(10000).each_with_index do |(dirname, filename, size), index| %>
@@ -104,12 +107,12 @@ function unselect_all_files() {
           <% end %>
       <% if CollectionsHelper::is_image(filename) %>
           <i class="fa fa-fw fa-bar-chart-o"></i> <%= filename %></div>
-       </div>
         <div class="collection_files_inline">
           <%= link_to(image_tag("#{url_for @object}/#{file_path}"),
                       link_params.merge(disposition: 'inline'),
                       {title: file_path}) %>
         </div>
+       </div>
       <% else %>
           <i class="fa fa-fw fa-file" href="<%=@object.uuid%>/<%=file_path%>" ></i> <%= filename %></div>
        </div>