[ARVADOS] updated: bc8c85ca59ff590ae2e336fc4552ec265d5ebb50

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/user_agreements_controller.rb  |  2 +-
 .../app/views/collections/_show_files.html.erb     | 29 ++++++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

       via  bc8c85ca59ff590ae2e336fc4552ec265d5ebb50 (commit)
       via  a9619cd9d563b5c434da6a11566517cacb410124 (commit)
       via  8012f6cc74ca6e39d6f4bbf097a66eee19f0c4da (commit)
      from  2d911a46e2698f18200bf2170bdb4c18452439a1 (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 bc8c85ca59ff590ae2e336fc4552ec265d5ebb50
Merge: a9619cd 8012f6c
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 11 16:19:52 2014 -0400

    Merge branch 'master' into 3654-combine-selections


commit a9619cd9d563b5c434da6a11566517cacb410124
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 11 16:18:07 2014 -0400

    3654: move the checkbox to the left of the row in collection show page. also, fixed a bug where the newly added selection dropdown shows up in the collection file chooser popup.

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 38c86e1..020f16d 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,4 +1,5 @@
 <div class="selection-action-container" style="padding-left: 1em">
+  <% if !defined? no_checkboxes or !no_checkboxes %>
   <div class="row">
     <div class="pull-left">
       <div class="btn-group btn-group-sm">
@@ -16,6 +17,7 @@
     </div>
   </div>
   <p/>
+  <% end %>
 
 <% file_tree = @object.andand.files_tree %>
 <% if file_tree.nil? or file_tree.empty? %>
@@ -41,17 +43,6 @@
        <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 %>
-
           <% if Rails.configuration.filename_suffixes_with_view_icon.include? file_path.split('.')[-1] %>
           <%= link_to(raw('<i class="fa fa-search"></i>'),
                       link_params.merge(disposition: 'inline'),
@@ -62,8 +53,20 @@
                       link_params.merge(disposition: 'attachment'),
                       {title: "Download #{file_path}", class: "btn btn-info btn-sm"}) %>
         </div>
+
+        <div class="collection_files_name">
+          <% 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 %>
       <% if CollectionsHelper::is_image(filename) %>
-        <div class="collection_files_name"><i class="fa fa-fw fa-bar-chart-o"></i> <%= filename %></div>
+          <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}"),
@@ -71,7 +74,7 @@
                       {title: file_path}) %>
         </div>
       <% else %>
-        <div class="collection_files_name"><i class="fa fa-fw fa-file"></i> <%= filename %></div>
+          <i class="fa fa-fw fa-file"></i> <%= filename %></div>
        </div>
       <% end %>
       </li>

-----------------------------------------------------------------------


hooks/post-receive
--