From ecaf4e935d372ed1b39ff16a908dcd2797479940 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Fri, 25 Aug 2017 22:18:04 -0400
Subject: [PATCH] 12033: Improve multi-site search navigation a bit.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---
 .../app/assets/javascripts/components/sessions.js      |  5 +++++
 apps/workbench/app/views/layouts/body.html.erb         | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/workbench/app/assets/javascripts/components/sessions.js b/apps/workbench/app/assets/javascripts/components/sessions.js
index cbf2a7e809..3d127f1714 100644
--- a/apps/workbench/app/assets/javascripts/components/sessions.js
+++ b/apps/workbench/app/assets/javascripts/components/sessions.js
@@ -19,6 +19,11 @@ window.SessionsTable = {
         var db = vnode.state.db
         var sessions = db.loadAll()
         return m('.container', [
+            m('p', [
+                'You can log in to multiple Arvados sites here, then use the ',
+                m('a[href="/collections/multisite"]', 'multi-site search'),
+                ' page to search collections on all sites at once.',
+            ]),
             m('table.table.table-condensed.table-hover', [
                 m('thead', m('tr', [
                     m('th', 'status'),
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index a2256a0569..fe1698eea7 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -29,9 +29,11 @@ SPDX-License-Identifier: AGPL-3.0 %>
           <% if current_user %>
             <% if current_user.is_active %>
             <li>
-              <%= link_to(controller: 'collections', action: 'multisite') do %>
-                Multisite search (beta)
-              <% end %>
+              <form class="navbar-form">
+                <%= link_to({controller: 'collections', action: 'multisite'}, {class: 'btn btn-default'}) do %>
+                  Multi-site search
+                <% end %>
+              </form>
             </li>
             <li>
               <form class="navbar-form" role="search"
@@ -46,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
                           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">
+                  <input type="text" class="form-control" placeholder="search this site">
                   <a class="input-group-addon"><span class="glyphicon glyphicon-search"></span></a>
                 </div>
               </form>
-- 
2.30.2