projects / arvados.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 24991cd5eb8f0269ab5f760d22277789393ee819..abef47136fd21dd90ae67cf246b51431344ef7b8 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -31,7 +31,7 @@
     body > div.container-fluid {
     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-9.col-sm-offset-3 {
     overflow: auto;
     }
@@ -42,14 +42,6 @@
     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;
@@ -60,18 +52,6 @@
     display: none;
     }
     }
-    .arvados-nav-container {
-    top: 70px; 
-    height: calc(100% - 70px); 
-    overflow: auto; 
-    z-index: 2;
-    }
-    .arvados-nav-active {
-    background: rgb(66, 139, 202);
-    }
-    .arvados-nav-active a {
-    color: white;
-    }
   </style>
 </head>
 <body>
@@ -105,13 +85,18 @@
               <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 %>
         <% end %>
       </ul>
-  
+
       <ul class="nav navbar-nav navbar-right">
 
         <li>
@@ -130,19 +115,20 @@
         </li>
         -->
 
-        <!-- XXX placeholder for this when persistent selection is implemented
-        <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 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>        
-        -->
+        </li>
 
+        <% if current_user.is_active %>
         <li class="dropdown notification-menu">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
             <span class="glyphicon glyphicon-envelope"></span>
@@ -150,7 +136,7 @@
             <span class="caret"></span>
           </a>
           <ul class="dropdown-menu" role="menu">
-            <% if @notifications.length > 0 %>
+            <% if (@notifications || []).length > 0 %>
               <% @notifications.each_with_index do |n, i| %>
                 <% if i > 0 %><li class="divider"></li><% end %>
                 <li class="notification"><%= n.call(self) %></li>
@@ -159,7 +145,8 @@
               <li class="notification empty">No notifications.</li>
             <% end %>
           </ul>
-        </li>        
+        </li>
+        <% end %>
 
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -167,10 +154,12 @@
           </a>
           <ul class="dropdown-menu" role="menu">
             <li role="presentation" class="dropdown-header"><%= current_user.email %></li>
+            <% if current_user.is_active %>
             <li role="presentation" class="divider"></li>
             <li role="presentation"><a href="/authorized_keys" role="menuitem">Manage ssh keys</a></li>
             <li role="presentation"><a href="/api_client_authorizations" role="menuitem">Manage API tokens</a></li>
             <li role="presentation" class="divider"></li>
+            <% end %>
             <li role="presentation"><a href="<%= logout_path %>" role="menuitem">Log out</a></li>
           </ul>
         </li>
@@ -184,33 +173,33 @@
 
   <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>
       <div class="col-sm-3 left-nav">
         <div class="arvados-nav-container">
-        <% if current_user %>
+        <% if current_user.andand.is_active %>
         <div class="well">
         <ul class="arvados-nav">
           <li class="<%= 'arvados-nav-active' if params[:action] == 'home' %>">
             <a href="/">Dashboard</a>
           </li>
-          
-          <% [['Data', [['humans'],
+
+          <% [['Data', [['collections', 'Collections (data files)'],
+                        ['humans'],
                         ['traits'],
                         ['specimens'],
-                        ['collections', 'Files'],
-                        ['links', 'Metadata']]],
-              ['Compute', [['pipeline_templates', 'Pipelines'],
+                        ['links']]],
+              ['Activity', [['pipeline_instances', 'Recent pipeline instances'],
+                            ['jobs', 'Recent jobs']]],
+              ['Compute', [['pipeline_templates'],
                            ['repositories', 'Code repositories'],
                            ['virtual_machines']]],
-              ['Activity', [['pipeline_instances', 'Recent pipelines'],
-                            ['jobs', 'Recent jobs']]],
               ['System', [['users'],
                          ['groups'],
                          ['nodes', 'Compute nodes'],
-                         ['keep_disks']]]].each do |j| %>   
+                         ['keep_disks']]]].each do |j| %>
             <li><%= j[0] %>
               <ul>
               <% j[1].each do |k| %>