[ARVADOS] updated: 74ac5edcb6ecff4003ec70cf904c900392a31814
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 5 14:36:11 EDT 2014
Summary of changes:
.../app/views/collections/_show_files.html.erb | 122 ++++++++++-----------
1 file changed, 59 insertions(+), 63 deletions(-)
via 74ac5edcb6ecff4003ec70cf904c900392a31814 (commit)
from 8c4233dae52c96ceb629d2be1be73b518118863a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 74ac5edcb6ecff4003ec70cf904c900392a31814
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 5 14:17:08 2014 -0400
3654: add selection dropdown to collection#show page
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 6cd9925..dc43fe2 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -17,71 +17,67 @@
</div>
<p/>
- <% file_tree = @object.andand.files_tree %>
- <% if file_tree.nil? or file_tree.empty? %>
- <p>This collection is empty.</p>
- <% else %>
- <ul id="collection_files" class="collection_files">
- <% dirstack = [file_tree.first.first] %>
- <% file_tree.each_with_index do |(dirname, filename, size), index| %>
- <% file_path = CollectionsHelper::file_path([dirname, filename]) %>
- <% while dirstack.any? and (dirstack.last != dirname) %>
- <% dirstack.pop %></ul></li>
- <% end %>
- <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-fw fa-folder-open"></i> <%= filename %></div>
+<% file_tree = @object.andand.files_tree %>
+<% if file_tree.nil? or file_tree.empty? %>
+ <p>This collection is empty.</p>
+<% else %>
+ <ul id="collection_files" class="collection_files">
+ <% dirstack = [file_tree.first.first] %>
+ <% file_tree.take(10000).each_with_index do |(dirname, filename, size), index| %>
+ <% file_path = CollectionsHelper::file_path([dirname, filename]) %>
+ <% while dirstack.any? and (dirstack.last != dirname) %>
+ <% dirstack.pop %></ul></li>
+ <% end %>
+ <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-fw fa-folder-open"></i> <%= filename %></div>
+ </div>
+ <ul class="collection_files">
+ <% else %>
+ <% link_params = {controller: 'collections', action: 'show_file',
+ uuid: @object.portable_data_hash, file: file_path, size: size} %>
+ <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",
+ :friendly_name => "#{@object.uuid}/#{file_path}",
+ :href => url_for(controller: 'collections', action: 'show_file',
+ uuid: @object.portable_data_hash, 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"}) %>
+ <%= link_to(raw('<i class="fa fa-download"></i>'),
+ link_params.merge(disposition: 'attachment'),
+ {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-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>
- <ul class="collection_files">
<% else %>
- <% link_params = {controller: 'collections', action: 'show_file',
- uuid: @object.portable_data_hash, file: file_path, size: size} %>
- <div class="collection_files_row">
- <div class="collection_files_buttons pull-right">
- <%= raw(human_readable_bytes_html(size)) %>
- <%= link_to(raw('<i class="fa fa-search"></i>'),
- link_params.merge(disposition: 'inline'),
- {title: "View #{file_path}", class: "btn btn-info btn-sm"}) %>
- <%= link_to(raw('<i class="fa fa-download"></i>'),
- link_params.merge(disposition: 'attachment'),
- {title: "Download #{file_path}", class: "btn btn-info btn-sm"}) %>
- </div>
-
- <div class="row pull-left">
- <div class="col-md-1">
- <% if !defined? no_checkboxes or !no_checkboxes %>
- <%= check_box_tag 'uuids[]', "#{@object.uuid}/#{file_path}", false, {
- :class => 'persistent-selection',
- :friendly_type => "File",
- :friendly_name => "#{@object.uuid}/#{file_path}",
- :href => url_for(controller: 'collections', action: 'show_file',
- uuid: @object.portable_data_hash, file: file_path),
- :title => "Include #{file_path} in your selections",
- } %>
- <% end %>
- </div>
-
- <% if CollectionsHelper::is_image(filename) %>
- <div class="collection_files_name col-md-9"><i class="fa fa-fw fa-bar-chart-o"></i> <%= filename %></div>
- </div>
- <%= link_to(image_tag("#{url_for @object}/#{file_path}"),
- link_params.merge(disposition: 'inline'),
- {title: file_path}) %>
- <% else %>
- <div class="collection_files_name col-md-9"><i class="fa fa-fw fa-file"></i> <%= filename %></div>
- </div>
- <% end %>
- </div>
- </li>
- <% end # if file or directory %>
- <% end # file_tree.each %>
- <%= raw(dirstack.map { |_| "</ul>" }.join("</li>")) %>
- <% end # if file_tree %>
+ <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 %>
+ <%= 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 %>
+<% content_for :footer_html do %>
+<div id="collection-sharing-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
+<% end %>
</div>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list