Merge branch 'master' into 2257-inequality-conditions

[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 1d6a46828a06ca93bd90f5a2ded2557968ec547b..abef47136fd21dd90ae67cf246b51431344ef7b8 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -115,14 +115,16 @@
         </li>
         -->
 
-        <li class="dropdown">
+        <li class="dropdown notification-menu">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
             <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">
-            <li><table style="width:100%"></table></li>
+            <ul class="dropdown-menu" role="menu" id="persistent-selection-list">
+              <%= form_tag '/actions' do %>
+              <div id="selection-form-content"></div>
+              <% end %>
           </ul>
         </li>
 
@@ -171,7 +173,7 @@
 
   <div class="container-fluid">
       <div class="col-sm-9 col-sm-offset-3">
-        <div id="content">
+        <div id="content" class="body-content">
           <%= yield %>
         </div>
       </div>