X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4bbd2177505ff09d6d9e77d1a1ea80523fcfd395..ca417c9626eb642e0e219d3928097c561e22b860:/apps/workbench/app/views/application/_choose.html.erb

diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index f292445895..4ee96df29f 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -8,36 +8,41 @@
 
       <div class="modal-body">
         <div class="input-group">
-          <% if params[:by_project] %>
-            <div class="input-group-btn">
+          <% if params[:by_project] != false %>
+            <div class="input-group-btn" data-filterable-target=".modal.arv-choose .selectable-container">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                Projects <span class="caret"></span>
+                Filter by project <span class="caret"></span>
               </button>
               <ul class="dropdown-menu" role="menu">
+                <li>
+                  <%= link_to '#', class: 'chooser-show-project' do %>
+                    Remove filter (search all projects)
+                  <% end %>
+                </li>
+                <li class="divider" />
                 <%= 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
                        end,
-                      :top_button => Proc.new do %>
-                        <% link_to "#", {"class" => "chooser-show-project btn btn-xs btn-default pull-right" } do %>
-                          All <%= controller.model_class.class_for_display.pluralize.downcase %>
-                        <% end %>
-                      <% end %>
-                <% } %>
-                <li class="divider" />
-                <li><span class="navbar-text" id="chooser-breadcrumb">All <%= controller.model_class.class_for_display.pluralize.downcase %></span></li>
+                      :top_button => nil
+                    } %>
               </ul>
             </div>
           <% end %>
-          <input type="text" class="form-control filterable-control" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
+          <input type="text" class="form-control filterable-control focus-on-display" placeholder="Search" data-filterable-target=".modal.arv-choose .selectable-container"/>
         </div>
+        <div style="height: 1em" />
+
+        <% preview_pane = (params[:preview_pane] != "false")
+           pane_col_class = preview_pane ? "col-sm-6" : "" %>
         <div class="row" style="height: 20em">
-	  <div class="col-sm-6 container arv-filterable-list selectable-container"
+	  <div class="col-sm-6 container arv-filterable-list selectable-container <%= 'multiple' if multiple %>"
 	       style="height: 100%; overflow-y: scroll"
 	       data-infinite-scroller="#choose-scroll"
 	       id="choose-scroll"
-	       data-infinite-content-href="<%= next_page_href partial: true %>">
-	    <%= render partial: 'choose_rows', locals: {multiple: multiple} %>
+	       data-infinite-content-href="<%= next_page_href partial: true %>"
+	       data-infinite-content-href0="<%= url_for partial: true %>">
+	    <%= render partial: 'choose_rows' %>
 	  </div>
           <div class="col-sm-6 modal-dialog-preview-pane" style="height: 100%; overflow-y: scroll">
           </div>