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;
}
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;
<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>
</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>
- -->
+ </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>
</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>
<li class="notification empty">No notifications.</li>
<% end %>
</ul>
- </li>
+ </li>
+ <% 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">
<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>
<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| %>