X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f92e43f87f137e00d3e23a2defa5c891da0e8462..059027a1ea97b853649bad7e85a0d2da254f3178:/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 22ccc2f91d..15f654596c 100644
--- 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: 'collections', action: 'multisite'}
+                       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 %>
@@ -138,10 +150,10 @@
               <li><%= link_to 'Browse public projects', "/projects/public" %></li>
             <% end %>
             <li class="dropdown hover-dropdown login-menu">
-              <a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a>
+              <a href="<%= arvados_api_client.arvados_login_url(return_to: request.url) %>">Log in</a>
               <ul class="dropdown-menu">
                 <li>
-                  <a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">
+                  <a href="<%= arvados_api_client.arvados_login_url(return_to: request.url) %>">
                     <span class="fa fa-lg fa-sign-in"></span>
                     <p style="margin-left: 1.6em; margin-top: -1.35em; margin-bottom: 0em; margin-right: 0.5em;">Log in or register with<br/>any Google account</p>
                   </a>
@@ -159,10 +171,12 @@
               <li role="presentation" class="dropdown-header">
                 Help
               </li>
-              <li>
-              <%= link_to raw('<i class="fa fa-fw fa-info"></i> Getting Started ...'), "#",
-                   {'data-toggle' => "modal", 'data-target' => '#getting-started-modal-window'}  %>
-              </li>
+              <% if Rails.configuration.enable_getting_started_popup %>
+                <li>
+                <%= link_to raw('<i class="fa fa-fw fa-info"></i> Getting Started ...'), "#",
+                     {'data-toggle' => "modal", 'data-target' => '#getting-started-modal-window'}  %>
+                </li>
+              <% end %>
               <% if Rails.configuration.arvados_public_data_doc_url %>
                 <li><%= link_to raw('<i class="fa fa-book fa-fw"></i> Public Pipelines and Data sets'), "#{Rails.configuration.arvados_public_data_doc_url}", target: "_blank" %></li>
               <% end %>
@@ -187,75 +201,7 @@
     </nav>
 
     <% if current_user.andand.is_active %>
-      <nav class="navbar navbar-default breadcrumbs" role="navigation">
-        <ul class="nav navbar-nav navbar-left">
-          <li>
-            <a href="/">
-              <i class="fa fa-lg fa-fw fa-dashboard"></i>
-              Dashboard
-            </a>
-          </li>
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
-              Projects
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu" style="min-width: 20em" role="menu">
-              <li role="menuitem">
-                  <%= link_to(
-                        url_for(
-                          action: 'choose',
-                          controller: 'search',
-                          filters: [['uuid', 'is_a', 'arvados#group']].to_json,
-                          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),
-                        { remote: true, method: 'get', title: "Search" }) do %>
-                    <i class="glyphicon fa-fw glyphicon-search"></i> Search all projects ...
-                  <% end %>
-               </li>
-              <% if Rails.configuration.anonymous_user_token and Rails.configuration.enable_public_projects_page %>
-                <li role="menuitem"><a href="/projects/public" role="menuitem"><i class="fa fa-fw fa-list"></i> Browse public projects </a>
-                </li>
-              <% end %>
-              <li role="menuitem">
-                <%= link_to projects_path(options: {ensure_unique_name: true}), role: 'menu-item', method: :post do %>
-                  <i class="fa fa-fw fa-plus"></i> Add a new project
-                <% end %>
-              </li>
-              <li role="presentation" class="divider"></li>
-              <%= 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)
-                  end,
-              } %>
-            </ul>
-          </li>
-          <% if @name_link or @object %>
-            <li class="nav-separator">
-              <i class="fa fa-lg fa-angle-double-right"></i>
-            </li>
-            <li>
-              <%= link_to project_path(current_user.uuid) do %>
-                Home
-              <% end %>
-            </li>
-            <% project_breadcrumbs.each do |p| %>
-              <li class="nav-separator">
-                <i class="fa fa-lg fa-angle-double-right"></i>
-              </li>
-              <li>
-                <%= link_to(p.name, project_path(p.uuid), data: {object_uuid: p.uuid, name: 'name'}) %>
-              </li>
-            <% end %>
-          <% end %>
-        </ul>
-      </nav>
+      <%= render partial: 'breadcrumbs' %>
     <% elsif !current_user %>   <%# anonymous %>
       <% if (@name_link or @object) and (project_breadcrumbs.any?) %>
         <nav class="navbar navbar-default breadcrumbs" role="navigation">
@@ -290,7 +236,7 @@
 <div id="report-issue-modal-window"></div>
 <script src="/browser_unsupported.js"></script>
 
-<%  if current_user and !current_user.prefs[:getting_started_shown] and
+<%  if Rails.configuration.enable_getting_started_popup and current_user and !current_user.prefs[:getting_started_shown] and
        !request.url.include?("/profile") and
        !request.url.include?("/user_agreements") and
        !request.url.include?("/inactive")%>