Merge branch 'master' into 3661-copy-move-from-show

[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 7d8ac4dacbad0a11ab95d3f63b1641a2300770f5..e1b08290b04559dae63a1b6091d8d4cdc135ce71 100644 (file)
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -1,22 +1,3 @@
-<% 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">
     <div class="panel panel-info">
@@ -34,6 +15,9 @@
        </h3>
       </div>
       <div class="panel-body">
+        <div class="arv-description-as-subtitle">
+          <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
+        </div>
         <img src="/favicon.ico" class="pull-right" alt="" style="opacity: 0.3"/>
         <% if defined? @same_pdh %>
           <p>Found in collections:<p>