Merge branch '2753-collection-tree-view'

[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 4cc262ecc0333c0d8d7eb311e959f80b93e0acea..38c5d00ba1b84fbf9ceeaaaebabf3542eb5ef280 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,48 +1,3 @@
-<% content_for :css do %>
-ul.collection_files {
-  line-height: 2.5em;
-  list-style-type: none;
-  background: #FFF;
-}
-
-ul.collection_files li {
-  clear: both;
-}
-
-li.collection_files_row_even {
-  background: #FFF;
-}
-
-li.collection_files_row_odd {
-  background: #EEE;
-}
-
-.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>
@@ -66,15 +21,18 @@ li.collection_files_row_odd {
     <% while dirstack.any? and (dirstack.last != dirname) %>
       <% dirstack.pop %></ul></li>
     <% end %>
-    <li class="collection_files_row_<%= (index.odd?) ? 'odd' : 'even' %>">
+    <li>
     <% if size.nil?  # This is a subdirectory. %>
       <% dirstack.push(File.join(dirname, filename)) %>
-      <div class="collection_files_name"><i class="fa fa-folder-open"></i> <%= filename %></div>
-        <ul class="collection_files">
+      <div class="collection_files_row">
+       <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_buttons">
+       <div class="collection_files_row">
+        <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',
@@ -92,14 +50,16 @@ li.collection_files_row_odd {
                       {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}"),
                       link_params.merge(disposition: 'inline'),
                       {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 %>