From: Tom Clegg <tom@curoverse.com>
Date: Mon, 21 Jul 2014 17:20:51 +0000 (-0400)
Subject: 3235: Hide projects dropdown unless caller asked for it.
X-Git-Tag: 1.1.0~2400^2~24
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7bb16e4139068847fc138a0c0375a05819e7bd00

3235: Hide projects dropdown unless caller asked for it.
---

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index a3ca815225..07edb4761e 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -12,9 +12,11 @@
       </div>
 
       <div class="modal-body">
-        <nav class="navbar navbar-default breadcrumbs" role="navigation">
-          <ul class="nav navbar-nav navbar-left">
-            <li class="dropdown">
+	<% if params[:by_project] %>
+	<div class="btn-group">
+	  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	    Projects <span class="caret"></span>
+	  </button>
             <%= render partial: "projects_tree_menu", locals: {
                   :project_link_to => Proc.new do |pnode, &block|
                     link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
@@ -34,7 +36,8 @@
           <div class="navbar-form navbar-right">
             <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
           </div>
-        </nav>
+        </div>
+        <% end %>
 
         <div class="row" style="height: 20em">
           <div class="col-sm-6 container-fluid arv-filterable-list selectable-container"
diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index 3334912992..5015fa83a5 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,8 +1,3 @@
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
-              <i class="fa fa-lg fa-fw fa-home"></i>
-              Projects
-              <span class="caret"></span>
-            </a>
             <ul class="dropdown-menu" role="menu">
               <li role="presentation" class="dropdown-header">
                 <%= top_button.call %>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 94fe580ec7..feaa7dbd37 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -182,6 +182,11 @@
       <nav class="navbar navbar-default breadcrumbs" role="navigation">
         <ul class="nav navbar-nav navbar-left">
           <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
+              <i class="fa fa-lg fa-fw fa-home"></i>
+              Projects
+              <span class="caret"></span>
+            </a>
             <%= render partial: "projects_tree_menu", locals: {
                   :project_link_to => Proc.new do |pnode, &block|
                     link_to(project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}, &block)