12519: Moved multisite search to its own URL

[arvados.git] / apps / workbench / app / views / layouts / body.html.erb

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 456f15f218cee86cc76098acb33f2fab9d78cc23..9c3e3e9832751c8e1832fa7f32df10bc4da8e5e5 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -1,3 +1,7 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
   <div id="wrapper" class="container-fluid">
     <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="navbar-header">
@@ -24,24 +28,36 @@
 
           <% if current_user %>
             <% if current_user.is_active %>
-            <li>
-              <form class="navbar-form" role="search"
-                         data-search-modal=
-                         "<%= url_for(
-                          action: 'choose',
-                          controller: 'search',
-                          title: 'Search',
-                          action_name: 'Show',
-                          action_href: url_for(controller: :actions, action: :show),
-                          action_method: 'get',
-                          action_data: {selection_param: 'uuid', success: 'redirect-to-created-object'}.to_json)
-                         %>">
-                <div class="input-group" style="width: 220px">
-                  <input type="text" class="form-control" placeholder="search">
-                  <a class="input-group-addon"><span class="glyphicon glyphicon-search"></span></a>
-                </div>
-              </form>
-            </li>
+              <% if Rails.configuration.multi_site_search %>
+                <li>
+                  <form class="navbar-form">
+                    <%=
+                       target = Rails.configuration.multi_site_search
+                       if target == true
+                         target = {controller: 'multisite', action: 'search'}
+                       end
+                       link_to("Multi-site search", target, {class: 'btn btn-default'}) %>
+                  </form>
+                </li>
+              <% end %>
+              <li>
+                <form class="navbar-form" role="search"
+                           data-search-modal=
+                           "<%= url_for(
+                            action: 'choose',
+                            controller: 'search',
+                            title: 'Search',
+                            action_name: 'Show',
+                            action_href: url_for(controller: :actions, action: :show),
+                            action_method: 'get',
+                            action_data: {selection_param: 'uuid', success: 'redirect-to-created-object'}.to_json)
+                           %>">
+                  <div class="input-group" style="width: 220px">
+                    <input type="text" class="form-control" placeholder="search this site">
+                    <a class="input-group-addon"><span class="glyphicon glyphicon-search"></span></a>
+                  </div>
+                </form>
+              </li>
             <% end %>
 
             <li class="dropdown notification-menu">
@@ -62,11 +78,7 @@
                     <i class="fa fa-lg fa-terminal fa-fw"></i> Virtual machines
                   <% end %>
                 </li>
-                <li role="menuitem">
-                  <%= link_to repositories_user_path(current_user), role: 'menu-item' do %>
-                    <i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories
-                  <% end %>
-                </li>
+                <li role="menuitem"><a href="/repositories" role="menuitem"><i class="fa fa-lg fa-code-fork fa-fw"></i> Repositories </a></li>
                 <li role="menuitem"><a href="/current_token" role="menuitem"><i class="fa fa-lg fa-ticket fa-fw"></i> Current token</a></li>
                 <li role="menuitem">
                   <%= link_to ssh_keys_user_path(current_user), role: 'menu-item' do %>