Merge branch 'master' into 3140-project-content-tabs

[arvados.git] / apps / workbench / app / views / projects / _show_contents.html.erb

diff --git a/apps/workbench/app/views/projects/_show_contents.html.erb b/apps/workbench/app/views/projects/_show_contents.html.erb
index fdc972de11b42d99ea922da37e018efbab39bacf..0c8fab208e2f657a0c612fb3a844673633cb3df3 100644 (file)
--- a/apps/workbench/app/views/projects/_show_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents.html.erb
@@ -41,6 +41,7 @@
        choose_projects_path(
         title: 'Move this project to...',
         editable: true,
+        my_root_selectable: true,
         action_name: 'Move',
         action_href: project_path(@object.uuid),
         action_method: 'put',
@@ -58,7 +59,11 @@
   <div class="row">
     <div class="col-sm-5">
       <div class="btn-group btn-group-sm">
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <i class="fa fa-fw fa-long-arrow-down "></i></button>
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection...</button>
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+          <span class="caret"></span>
+          <span class="sr-only">Toggle Dropdown</span>
+        </button>
         <ul class="dropdown-menu" role="menu">
           <li><%= link_to "Compare selected", '#',
                   'data-href' => compare_pipeline_instances_path,
@@ -75,7 +80,23 @@
         </ul>
       </div>
     </div>
-    <div class="col-sm-4 pull-right">
+    <div class="col-sm-3">
+      <form class="form-inline" role="form">
+        Show:
+        <select class="form-control form-control-sm filterable-control" data-filterable-attribute="data-kind" data-filterable-target="table.arv-index.arv-project-contents tbody">
+          <option value="">Everything</option>
+          <option value="arvados#collection">Data</option>
+          <option value="arvados#pipelineInstance arvados#job">Compute jobs</option>
+          <option value="arvados#pipelineTemplate">Pipelines</option>
+          <!--
+          <option value="arvados#specimen">Specimens</option>
+          <option value="arvados#human">Humans</option>
+          <option value="arvados#trait">Traits</option>
+          -->
+        </select>
+      </form>
+    </div>
+    <div class="col-sm-4">
       <input type="text" class="form-control filterable-control" placeholder="Search project contents" data-filterable-target="table.arv-index.arv-project-contents tbody"/>
     </div>
   </div>
@@ -86,7 +107,6 @@
       <col width="60%" />
     </colgroup>
     <tbody data-infinite-scroller="#Contents-scroll" data-infinite-content-href="<%= url_for(format: :json, partial: :contents_rows, offset: next_page_offset) if next_page_offset %>">
-<% puts "\n**********objects_and_names in contents page = #{@objects_and_names}" %>
       <%= render partial: 'show_contents_rows', locals: {project: @object, objects_and_names: @objects_and_names} %>
     </tbody>
     <thead>