Merge branch 'master' into 2761-diagnostic-suite

[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..a80cf3985d92731b561b81dec01e62acc91d0323 100644 (file)
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -2,7 +2,6 @@
   <%= link_to(
       choose_projects_path(
        title: 'Copy to project...',
-       my_root_selectable: true,
        action_name: 'Copy',
        action_href: actions_path,
        action_method: 'post',
@@ -34,6 +33,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>