11846: update file path parameter name in renaming collection image files and add...

[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 37d9283dbd7a85d6a2f1a797fa3becae18c9828f..2c568fb6a53f61af00e2ebfff3b281949944510b 100644 (file)
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -27,13 +27,14 @@
                     'data-selection-action' => 'combine-collections',
                     'data-toggle' => 'dropdown'
               %></li>
-            <% if @object.editable? %>
+            <% if object.editable? %>
             <li><%= link_to "Remove selected files", '#',
                     method: :post,
-                    'data-href' => url_for(action: :remove_selected_files),
+                    'data-href' => url_for(controller: 'collections', action: :remove_selected_files),
                     'data-selection-param-name' => 'selection[]',
                     'data-selection-action' => 'remove-selected-files',
-                    'data-toggle' => 'dropdown'
+                    'data-toggle' => 'dropdown',
+                    'class' => 'btn-remove-selected-files'
               %></li>
             <% end %>
           </ul>
@@ -96,15 +97,19 @@
             <span>&nbsp;</span>
             <% end %>
 
-            <% if @object.editable? %>
-                <%= link_to({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', title: "Remove #{file_path}") do %>
+            <% 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 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>
-              <% if @object.editable? %>
-                <%= render_editable_attribute @object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_path' => 'rename-file-path:'+file_path} %>
+              <% if object.editable? %>
+                <span class="btn-collection-rename-file-span">
+                <%= render_editable_attribute object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_name' => 'rename-file-path:'+file_path}, {tiptitle: 'Edit name or directory or both for this file', btnclass: 'collection-file-control'} %>
+                </span>
               <% else %>
                 <%= filename %>
               <% end %>
@@ -116,8 +121,9 @@
           </div>
          </div>
         <% else %>
-              <% if @object.editable? %>
-                <i class="fa fa-fw fa-file"></i><%= render_editable_attribute @object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_name' => 'rename-file-path:'+file_path} %>
+              <% if object.editable? %>
+                <i class="fa fa-fw fa-file"></i><span class="btn-collection-rename-file-span"><%= render_editable_attribute object, 'filename', filename, {'data-value' => file_path, 'data-toggle' => 'manual', 'selection_name' => 'rename-file-path:'+file_path}, {tiptitle: 'Edit name or directory or both for this file', btnclass: 'collection-file-control'}  %>
+                </span>
               <% else %>
                 <i class="fa fa-fw fa-file" href="<%=object.uuid%>/<%=file_path%>" ></i> <%= filename %>
               <% end %>