Merge branch 'master' into 7478-anm-spot-instances

[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 3315027b3d9a1b485eaf0b578b86af1e1e68cb30..124a78577f3e5cac875569c8912217d65b8fc1ce 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -28,24 +28,36 @@ SPDX-License-Identifier: AGPL-3.0 %>
 
           <% 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: 'search', action: 'index'}
+                       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">
@@ -60,7 +72,16 @@ SPDX-License-Identifier: AGPL-3.0 %>
                 </li>
                 <% if current_user.is_active %>
                 <li role="menuitem"><a href="/projects/<%=current_user.uuid%>" role="menuitem"><i class="fa fa-lg fa-home fa-fw"></i> Home project </a></li>
-
+                  <% if Rails.configuration.composer_url %>
+                    <li role="menuitem">
+                     <form action="<%= Rails.configuration.composer_url %>" method="GET">
+                       <input type="hidden" name="api_token" value="<%= Thread.current[:arvados_api_token] %>" />
+                       <button role="menuitem" type="submit">
+                         <i class="fa fa-lg fa-share-alt fa-fw"></i> Workflow Composer
+                       </button>
+                     </form>
+                    </li>
+                  <% end %>
                 <li role="menuitem">
                   <%= link_to virtual_machines_user_path(current_user), role: 'menu-item' do %>
                     <i class="fa fa-lg fa-terminal fa-fw"></i> Virtual machines
@@ -72,8 +93,8 @@ SPDX-License-Identifier: AGPL-3.0 %>
                   <%= link_to ssh_keys_user_path(current_user), role: 'menu-item' do %>
                     <i class="fa fa-lg fa-key fa-fw"></i> SSH keys
                   <% end %>
-                </li>
-
+</li>
+                <li role="menuitem"><a href="/users/link_account" role="menuitem"><i class="fa fa-lg fa-link fa-fw"></i> Link account </a></li>
                 <% if Rails.configuration.user_profile_form_fields %>
                   <li role="menuitem"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-lg fa-user fa-fw"></i> Manage profile</a></li>
                 <% end %>