Fix some whitespace complaints.

[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 f141536f9c72dfd678df299422d3a8d03228e2fc..63cf67c263f8b0f5eeb20be7c5add52e3acf0a31 100644 (file)
--- 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;
     }
 
@@ -42,27 +42,15 @@
     padding-top: 1.25em;
     }
 
-    /* Setting the height needs to be fixed with javascript. */
-    .dropdown-menu {
-    padding-right: 20px;
-    max-height: 440px;
-    width: 400px;
-    overflow-y: auto;
-    }
     @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>
@@ -97,7 +85,12 @@
               <span class="glyphicon glyphicon-arrow-right"></span>
             </li>
             <li>
-<%= link_to controller.breadcrumb_page_name, request.fullpath %>
+              <%= link_to controller.breadcrumb_page_name, request.fullpath %>
+            </li>
+            <li style="padding: 14px 0 14px">
+              <%= form_tag do |f| %>
+                <%= render :partial => "selection_checkbox", :locals => {:object => @object} %>
+              <% end %>
             </li>
           <% end %>
         <% end %>
@@ -122,22 +115,22 @@
         </li>
         -->
 
-        <!-- XXX placeholder for this when persistent selection is implemented
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+        <li class="dropdown notification-menu">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="collections-menu">
             <span class="glyphicon glyphicon-paperclip"></span>
-            <span class="badge badge-alert"><%= @selection_count %></span>
+            <span class="badge" id="persistent-selection-count"></span>
             <span class="caret"></span>
           </a>
-          <ul class="dropdown-menu" role="menu">
-              <li style="padding: 10px">No selections.</li>
+            <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>
@@ -156,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">
@@ -179,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">
@@ -193,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']]],
@@ -212,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 %>