Merge branch 'master' into 3140-project-content-tabs

[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 38c5d00ba1b84fbf9ceeaaaebabf3542eb5ef280..8576d4044069266e971023eb635f333482de14b8 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,13 +1,6 @@
 <% 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>
+<span style="padding-left: 1em">Collection storage status:</span>
+<%= render partial: 'toggle_persist', locals: { uuid: @object.uuid, current_state: (@is_persistent ? 'persistent' : 'cache') } %>
 <% end %>
 
 <% file_tree = @object.andand.files_tree %>
@@ -34,6 +27,7 @@
        <div class="collection_files_row">
         <div class="collection_files_buttons pull-right">
           <%= raw(human_readable_bytes_html(size)) %>
+          <% if !defined? no_checkboxes or !no_checkboxes %>
           <%= check_box_tag 'uuids[]', "#{@object.uuid}/#{file_path}", false, {
                 :class => 'persistent-selection',
                 :friendly_type => "File",
@@ -42,6 +36,7 @@
                                  uuid: @object.uuid, file: file_path),
                 :title => "Include #{file_path} in your selections",
               } %>
+          <% end %>
           <%= link_to(raw('<i class="fa fa-search"></i>'),
                       link_params.merge(disposition: 'inline'),
                       {title: "View #{file_path}", class: "btn btn-info btn-sm"}) %>
@@ -64,5 +59,9 @@
       </li>
     <% end  # if file or directory %>
   <% end  # file_tree.each %>
-  </ul>
+  <%= raw(dirstack.map { |_| "</ul>" }.join("</li>")) %>
 <% end  # if file_tree %>
+
+<% content_for :footer_html do %>
+<div id="collection-sharing-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
+<% end %>