3235: Merge branch 'master' into 3235-top-nav-site-search

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

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index ec2c98bdcb181d10f189c500e3e5972d96a6c773..bd6a6aae4097cad0dadbe6004d2488c1e993a7b5 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -74,6 +74,20 @@
           </li>
           -->
 
+          <li>
+            <%= link_to(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),
+                      { class: "", remote: true, method: 'get' }) do %>
+              <i class="fa fa-fw fa-search"></i> Search
+            <% end %>
+          </li>
+
           <li class="dropdown notification-menu">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="notifications-menu">
               <span class="badge badge-alert notification-count"><%= @notification_count %></span>
@@ -169,7 +183,21 @@
     <% 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-home"></i>
+              Home
+            </a>
+          </li>
+          <li class="nav-separator">
+            <i class="fa fa-lg fa-angle-double-right"></i>
+          </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" role="menu">
             <%= 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)
@@ -180,6 +208,7 @@
                     <% end %>
                   <% end %>
             <% } %>
+            </ul>
           </li>
           <% project_breadcrumbs.each do |p| %>
             <li class="nav-separator">