Merge branch 'master' into 2681-new-inactive-user-notification

[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 cbdbef6b9f12fcc561810f3a330a2c2bfda4cc5f..74e02f79fe0c87a18a56b99dfa6c5ab3e0c645ff 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,62 +1,11 @@
-<% content_for :css do %>
-ul#collection_files {
-  padding-left: 0;
-}
-
-ul.collection_files {
-  line-height: 2.5em;
-  list-style-type: none;
-  padding-left: 2.3em;
-}
-
-ul.collection_files li {
-  clear: both;
-}
-
-.collection_files_row {
-  padding: 1px;  /* Replaced by border for :hover */
-}
-
-.collection_files_row:hover {
-  background-color: #D9EDF7;
-  padding: 0px;
-  border: 1px solid #BCE8F1;
-  border-radius: 3px;
-}
-
-.collection_files_inline {
-  clear: both;
-  width: 80%;
-  height: auto;
-  max-height: 6em;
-  margin: 0 1em;
-}
-
-.collection_files_name {
-  padding-left: .5em;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.collection_files_name i.fa {
-  display: block-inline;
-  width: 1.75em;
-  text-align: center;
-}
-
-.collection_files_buttons {
-  float: right;
-}
-<% 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:
+      <span style="padding-left: 1em">Collection storage status:</span>
       <%= render partial: 'toggle_persist', locals: { uuid: @object.uuid, current_state: (@is_persistent ? 'persistent' : 'cache') } %>
+
     </div>
   </div>
 </div>
@@ -77,14 +26,14 @@ ul.collection_files li {
     <% if size.nil?  # This is a subdirectory. %>
       <% dirstack.push(File.join(dirname, filename)) %>
       <div class="collection_files_row">
-       <div class="collection_files_name"><i class="fa fa-folder-open"></i> <%= filename %></div>
+       <div class="collection_files_name"><i class="fa fa-fw fa-folder-open"></i> <%= filename %></div>
       </div>
       <ul class="collection_files">
     <% else %>
       <% link_params = {controller: 'collections', action: 'show_file',
                         uuid: @object.uuid, file: file_path, size: size} %>
        <div class="collection_files_row">
-        <div class="collection_files_buttons">
+        <div class="collection_files_buttons pull-right">
           <%= raw(human_readable_bytes_html(size)) %>
           <%= check_box_tag 'uuids[]', "#{@object.uuid}/#{file_path}", false, {
                 :class => 'persistent-selection',
@@ -102,7 +51,7 @@ ul.collection_files li {
                       {title: "Download #{file_path}", class: "btn btn-info btn-sm"}) %>
         </div>
       <% if CollectionsHelper::is_image(filename) %>
-        <div class="collection_files_name"><i class="fa fa-bar-chart-o"></i> <%= filename %></div>
+        <div class="collection_files_name"><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}"),
@@ -110,11 +59,15 @@ ul.collection_files li {
                       {title: file_path}) %>
         </div>
       <% else %>
-        <div class="collection_files_name"><i class="fa fa-file"></i> <%= filename %></div>
+        <div class="collection_files_name"><i class="fa fa-fw fa-file"></i> <%= filename %></div>
        </div>
       <% end %>
       </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 %>