[ARVADOS] updated: 72a377c59d972dd64de6e500c140738ff4b3dea6

Git user git at public.curoverse.com
Mon Apr 17 13:35:29 EDT 2017


Summary of changes:
 apps/workbench/app/views/collections/_show_files.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

       via  72a377c59d972dd64de6e500c140738ff4b3dea6 (commit)
      from  bf55ee80e71c6503292a44fb377927f2ed908f9b (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 72a377c59d972dd64de6e500c140738ff4b3dea6
Author: radhika <radhika at curoverse.com>
Date:   Mon Apr 17 13:34:44 2017 -0400

    11465: correct disabled tooltip behavior on image types

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index c528d24..4202b33 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -99,17 +99,17 @@
 
             <% if object.editable? %>
                 <span class="btn-collection-remove-file-span">
-                <%= link_to({controller: 'collections', action: 'remove_selected_files', id: object.uuid, selection: [object.portable_data_hash+'/'+file_path]}, method: :post, remote: true, data: {confirm: "Remove #{file_path}?", toggle: 'tooltip', placement: 'top'}, class: 'btn btn-sm btn-default btn-nodecorate btn-collection-file-control', title: "Remove #{file_path}") do %>
+                <%= link_to({controller: 'collections', action: 'remove_selected_files', id: object.uuid, selection: [object.portable_data_hash+'/'+file_path]}, method: :post, remote: true, data: {confirm: "Remove #{file_path}?", toggle: 'tooltip', placement: 'top'}, class: 'btn btn-sm btn-default btn-nodecorate btn-collection-file-control', title: 'Remove this file') do %>
                   <i class="fa fa-fw fa-trash-o"></i>
                 <% end %>
                 </span>
             <% end %>
         <% if CollectionsHelper::is_image(filename) %>
             <i class="fa fa-fw fa-bar-chart-o"></i>
-              <span class="btn-collection-rename-file-span">
               <% if object.editable? %>
-                <%= render_editable_attribute object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_path' => 'rename-file-path:'+file_path}, {tiptitle: 'Edit name or directory or both for this file'} %>
-              </span>
+                <span class="btn-collection-rename-file-span">
+                <%= render_editable_attribute object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_path' => 'rename-file-path:'+file_path}, {tiptitle: 'Edit name or directory or both for this file', btnclass: 'collection-file-control'} %>
+                </span>
               <% else %>
                 <%= filename %>
               <% end %>

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list