nav menus

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index c67fb40846b46b6304275834a403de944521e839..8df4bbf600f9e960a14e7335203490092bd1d6ba 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -38,17 +38,27 @@
         <a class="brand" href="/"><%= Rails.configuration.site_name rescue Rails.application.class.parent_name %></a>
         <div class="nav-collapse collapse">
           <ul class="nav">
-           <% [
-              [false, 'Keys', authorized_keys_path],
-              [false, 'VMs', virtual_machines_path],
-              [false, 'Repos', repositories_path],
-              [false, 'Tokens', api_client_authorizations_path],
-              [false, 'Jobs', jobs_path]
-              ].each do |admin_only, name, path| %>
-           <% if !admin_only or (current_user and current_user.is_admin) %>
-            <li<%= raw ' class="active"' if request.fullpath.index(path) %>><a href="<%= path %>"><%= name %></a></li>
-           <% end %>
-           <% end %>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                Access <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><%= link_to 'Keys', authorized_keys_path %></li>
+                <li><%= link_to 'VMs', virtual_machines_path %></li>
+                <li><%= link_to 'Repositories', repositories_path %></li>
+                <li><%= link_to 'API Tokens', api_client_authorizations_path %></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                Compute <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><%= link_to 'Jobs', jobs_path %></li>
+                <li><%= link_to 'Pipeline instances', pipeline_instances_path %></li>
+                <li><%= link_to 'Pipeline templates', pipeline_templates_path %></li>
+              </ul>
+            </li>
          </ul>
          <ul class="nav pull-right">
       <% if current_user -%>