3114: Merge branch 'master' into 3114-copy-to-project

[arvados.git] / apps / workbench / app / views / collections / show.html.erb

diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index f049de9ef05504573a554b31cb2622808e49f450..0d52b088c47a91f59bc1f46092d4a73e3fc51a34 100644 (file)
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -1,24 +1,21 @@
-<div class="dropdown">
-  <button class="btn btn-default dropdown-toggle" id="copy2project-btn" type="button" data-toggle="dropdown">
-    Copy this collection to project...
-    <span class="caret"></span>
-  </button>
-  <ul class="dropdown-menu" role="menu" aria-labelledby="copy2project-btn">
-    <%= render partial: "projects_tree_menu", locals: {
-          :project_link_to => Proc.new do |pnode, &block|
-            link_to( actions_path(id: pnode[:object].uuid,
-                                  selection: [ @object.uuid ],
-                                  selection_param: 'selection[]',
-                                  copy_selections_into_project: pnode[:object].uuid,
-                                  success: 'redirect-to-created-object'),
-                      method: :post,
-                      &block)
-          end,
-          :top_button => nil
-         } %>
-  </ul>
-</div>
-
+<% content_for :tab_line_buttons do %>
+  <%= link_to(
+      choose_projects_path(
+       title: 'Copy to project...',
+       my_root_selectable: true,
+       action_name: 'Copy',
+       action_href: actions_path,
+       action_method: 'post',
+       action_data: {
+         copy_selections_into_project: true,
+         selection: @name_link.andand.uuid || @object.uuid,
+         selection_param: 'uuid',
+         success: 'redirect-to-created-object'
+       }.to_json),
+      { class: "btn btn-sm btn-primary arv-move-to-project", remote: true, method: 'get' }) do %>
+    <i class="fa fa-fw fa-copy"></i> Copy to project...
+  <% end %>
+<% end %>
 
 <div class="row row-fill-height">
   <div class="col-md-6">
@@ -112,4 +109,9 @@
   </div>
 </div>
 
-<%= render file: 'application/show.html.erb' %>
+<% content_for :tab_line_buttons do %>
+  <span style="padding-left: 1em">Collection storage status:</span>
+  <%= render partial: 'toggle_persist', locals: { uuid: @object.uuid, current_state: (@is_persistent ? 'persistent' : 'cache') } %>
+<% end %>
+
+<%= render file: 'application/show.html.erb', locals: local_assigns %>