X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/89355aa0e2727373fa60c781ec6c00c31a79a7dc..6232434d6b86192b0531bacd7e4f0d5ae589f368:/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 db8074b1ad..63cf67c263 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -32,7 +32,7 @@
     padding-top: 70px; /* 70px to make the container go all the way to the bottom of the navbar */
     }
 
-    body > div.container-fluid > div.col-sm-10.col-sm-offset-2 {
+    body > div.container-fluid > div.col-sm-9.col-sm-offset-3 {
     overflow: auto;
     }
 
@@ -43,19 +43,14 @@
     }
 
     @media (min-width: 768px) {
-        .left-nav {
-            position: fixed;
-            top: 0;
-            left: 0;
-            height: 100%;
-            padding-left: 0;
-        }
+    .left-nav {
+    position: fixed;
+    }
     }
-
     @media (max-width: 767px) {
-        .breadcrumbs {
-            display: none;
-        }
+    .breadcrumbs {
+    display: none;
+    }
     }
   </style>
 </head>
@@ -121,18 +116,21 @@
         -->
 
         <li class="dropdown notification-menu">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="collections-menu">
             <span class="glyphicon glyphicon-paperclip"></span>
             <span class="badge" id="persistent-selection-count"></span>
             <span class="caret"></span>
           </a>
-          <ul class="dropdown-menu" role="menu" id="persistent-selection-list">
+            <ul class="dropdown-menu" role="menu" id="persistent-selection-list">
+              <%= form_tag '/actions' do %>
+              <div id="selection-form-content"></div>
+              <% end %>
           </ul>
         </li>
 
         <% if current_user.is_active %>
         <li class="dropdown notification-menu">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="notifications-menu">
             <span class="glyphicon glyphicon-envelope"></span>
             <span class="badge badge-alert notification-count"><%= @notification_count %></span>
             <span class="caret"></span>
@@ -151,7 +149,7 @@
         <% end %>
 
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="user-menu">
             <span class="glyphicon glyphicon-user"></span><span class="caret"></span>
           </a>
           <ul class="dropdown-menu" role="menu">
@@ -174,12 +172,12 @@
   </div>
 
   <div class="container-fluid">
-      <div class="col-sm-10 col-sm-offset-2">
-        <div id="content">
+      <div class="col-sm-9 col-sm-offset-3">
+        <div id="content" class="body-content">
           <%= yield %>
         </div>
       </div>
-      <div class="col-sm-2 left-nav">
+      <div class="col-sm-3 left-nav">
         <div class="arvados-nav-container">
         <% if current_user.andand.is_active %>
         <div class="well">
@@ -188,13 +186,13 @@
             <a href="/">Dashboard</a>
           </li>
 
-          <% [['Data', [['collections', 'Collections (data&nbsp;files)'],
+          <% [['Data', [['collections', 'Collections (data files)'],
                         ['humans'],
                         ['traits'],
                         ['specimens'],
                         ['links']]],
-              ['Activity', [['pipeline_instances',],
-                            ['jobs']]],
+              ['Activity', [['pipeline_instances', 'Recent pipeline instances'],
+                            ['jobs', 'Recent jobs']]],
               ['Compute', [['pipeline_templates'],
                            ['repositories', 'Code repositories'],
                            ['virtual_machines']]],
@@ -207,11 +205,9 @@
               <% j[1].each do |k| %>
                 <% unless k[0] == 'users' and !current_user.andand.is_admin %>
                   <li class="<%= 'arvados-nav-active' if (params[:controller] == k[0] && params[:action] != 'home') %>">
-                    <div>
-                      <a href="/<%= k[0] %>">
-                        <%= if k[1] then raw(k[1]) else k[0].capitalize.gsub('_', ' ') end %>
-                      </a>
-                    </div>
+                    <a href="/<%= k[0] %>">
+                      <%= if k[1] then k[1] else k[0].capitalize.gsub('_', ' ') end %>
+                    </a>
                   </li>
                 <% end %>
               <% end %>