3140: Move tab line buttons, remove show filtering widget

diff --git a/apps/workbench/app/views/application/_content_layout.html.erb b/apps/workbench/app/views/application/_content_layout.html.erb
index 426a497a605111eb8e56e1c60e114b2dda393f17..c8e38277201b7a465fcc53a1f7b82556d7c18f31 100644 (file)
--- a/apps/workbench/app/views/application/_content_layout.html.erb
+++ b/apps/workbench/app/views/application/_content_layout.html.erb
@@ -1,6 +1,13 @@
 <%= content_for :content_top %>
-<br clear="all" />
-<div class="pull-right">
-  <%= content_for :tab_line_buttons %>
-</div>
+  <% if @object and @object.is_a?(Group) and @object.group_class.in?(['project','folder']) %>
+  <div class="pull-right">
+    <%= content_for :tab_line_buttons %>
+  </div>
+  <br clear="all" />
+<% else %>
+  <br clear="all" />
+  <div class="pull-right">
+    <%= content_for :tab_line_buttons %>
+  </div>
+<% end %>
 <%= content_for :tab_panes %>

diff --git a/apps/workbench/app/views/projects/_show_contents.html.erb b/apps/workbench/app/views/projects/_show_contents.html.erb
index c3d509f90ab926348647e5c2edbb45216a07000c..d6114ef77af6ce94516336894fb0267eac88eef7 100644 (file)
--- a/apps/workbench/app/views/projects/_show_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents.html.erb
@@ -58,11 +58,7 @@
   <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...</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>
+        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <i class="fa fa-fw fa-long-arrow-down "></i></button>
         <ul class="dropdown-menu" role="menu">
           <li><%= link_to "Compare selected", '#',
                   'data-href' => compare_pipeline_instances_path,
@@ -79,23 +75,7 @@
         </ul>
       </div>
     </div>
-    <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">
+    <div class="col-sm-4 pull-right">
       <input type="text" class="form-control filterable-control" placeholder="Search project contents" data-filterable-target="table.arv-index.arv-project-contents tbody"/>
     </div>
   </div>