[ARVADOS] created: 2d6b7dc675515cda26872dad430cf9195b648370
git at public.curoverse.com
git at public.curoverse.com
Tue Feb 4 04:14:40 EST 2014
at 2d6b7dc675515cda26872dad430cf9195b648370 (commit)
commit 2d6b7dc675515cda26872dad430cf9195b648370
Merge: 342898f 003826a
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Feb 4 01:14:03 2014 -0800
Merge branch 'master' into 1979-workbench-ui
commit 342898f7584a00e91db4befd38782f1352e648e7
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Feb 4 01:11:22 2014 -0800
Merge top nav menus into brand dropdown, move breadcrumbs into top
nav, and lighten up the top nav.
refs #1979
diff --git a/apps/workbench/app/assets/stylesheets/application.css b/apps/workbench/app/assets/stylesheets/application.css
index d2993be..8c777c8 100644
--- a/apps/workbench/app/assets/stylesheets/application.css
+++ b/apps/workbench/app/assets/stylesheets/application.css
@@ -78,3 +78,14 @@ form.small-form-margin {
.nowrap {
white-space: nowrap;
}
+.navbar .nav li.nav-separator > span {
+ display: block;
+ float: none;
+ color: #bbbbbb;
+ padding: 10px 0 10px;
+ text-decoration: none;
+ text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .nav .dropdown .dropdown-menu li a {
+ padding: 2px 20px;
+}
diff --git a/apps/workbench/app/views/application/_breadcrumb_page_name.html.erb b/apps/workbench/app/views/application/_breadcrumb_page_name.html.erb
index 67387fd..1fcbe88 100644
--- a/apps/workbench/app/views/application/_breadcrumb_page_name.html.erb
+++ b/apps/workbench/app/views/application/_breadcrumb_page_name.html.erb
@@ -1 +1 @@
-<%= controller.breadcrumb_page_name %>
+<%= link_to controller.breadcrumb_page_name, request.fullpath %>
diff --git a/apps/workbench/app/views/application/_breadcrumbs.html.erb b/apps/workbench/app/views/application/_breadcrumbs.html.erb
index 26709ad..9929462 100644
--- a/apps/workbench/app/views/application/_breadcrumbs.html.erb
+++ b/apps/workbench/app/views/application/_breadcrumbs.html.erb
@@ -1,19 +1,17 @@
-<ul class="breadcrumb">
+<ul class="nav">
+ <li class="nav-separator">
+ <span><i class="icon-arrow-right"></i></span>
+ </li>
<li>
- <%= link_to((Rails.configuration.site_name rescue Rails.application.class.parent_name), '/') %>
- <span class="divider">/</span>
+ <%= link_to(
+ controller.model_class.to_s.pluralize.underscore.gsub('_', ' '),
+ url_for({controller: params[:controller]})) %>
</li>
- <% if params[:action] == 'index' %>
- <li class="active">
- <%= controller.model_class.to_s.pluralize.underscore.gsub '_', ' ' %>
- </li>
- <% else %>
- <li><%= link_to(
- controller.model_class.to_s.pluralize.underscore.gsub('_', ' '),
- url_for({controller: params[:controller]})) %>
- <span class="divider">/</span>
+ <% if params[:action] != 'index' %>
+ <li class="nav-separator">
+ <span><i class="icon-arrow-right"></i></span>
</li>
- <li class="active">
+ <li>
<%= render partial: 'breadcrumb_page_name' %>
</li>
<% end %>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 4a0528b..afa03ba 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -32,9 +32,41 @@
</head>
<body>
- <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <a class="brand" style="margin-left: 1px" href="/"><%= Rails.configuration.site_name rescue Rails.application.class.parent_name %></a>
+ <ul class="nav">
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" href="/">
+ <b><%= Rails.configuration.site_name rescue Rails.application.class.parent_name %></b>
+ </a>
+ <ul class="dropdown-menu">
+ <li><%= link_to 'Home', root_url %></li>
+ <li class="divider"></li>
+ <li><%= link_to 'Keys', authorized_keys_path %></li>
+ <li><%= link_to 'VMs', virtual_machines_path %></li>
+ <li><%= link_to 'Repositories', repositories_path %></li>
+ <li><%= link_to 'API Tokens', api_client_authorizations_path %></li>
+ <li class="divider"></li>
+ <li><%= link_to 'Jobs', jobs_path %></li>
+ <li><%= link_to 'Pipeline instances', pipeline_instances_path %></li>
+ <li><%= link_to 'Pipeline templates', pipeline_templates_path %></li>
+ <li class="divider"></li>
+ <li><%= link_to 'Collections', collections_path %></li>
+ <li><%= link_to 'Links', links_path %></li>
+ <li><%= link_to 'Humans', humans_path %></li>
+ <li><%= link_to 'Specimens', specimens_path %></li>
+ <li><%= link_to 'Traits', traits_path %></li>
+ <li class="divider"></li>
+ <% if current_user.andand.is_admin %>
+ <li><%= link_to 'Users', users_path %></li>
+ <% end %>
+ <li><%= link_to 'Groups', groups_path %></li>
+ <li><%= link_to 'Compute nodes', nodes_path %></li>
+ <li><%= link_to 'Keep disks', keep_disks_path %></li>
+ </ul>
+ </li>
+ </ul>
+ <%= content_for?(:breadcrumbs) ? yield(:breadcrumbs) : render(partial: 'breadcrumbs') %>
<ul class="nav pull-right">
<li>
@@ -42,6 +74,17 @@
<%= render partial: 'loading' %>
</div>
</li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" href="/">
+ Help <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li><%= link_to 'Tutorials and User guide', "#{Rails.configuration.arvados_docsite}/user", target: "_blank" %></li>
+ <li><%= link_to 'API Reference', "#{Rails.configuration.arvados_docsite}/api", target: "_blank" %></li>
+ <li><%= link_to 'SDK Reference', "#{Rails.configuration.arvados_docsite}/sdk", target: "_blank" %></li>
+ <li><%= link_to 'Admin guide', "#{Rails.configuration.arvados_docsite}/admin", target: "_blank" %></li>
+ </ul>
+ </li>
<% if current_user -%>
<li><span class="badge badge-info" style="margin: 10px auto 10px; padding-top: 4px; padding-bottom: 4px"><%= current_user.email %></span></li>
<li><a href="<%= logout_path %>">Log out</a></li>
@@ -49,76 +92,11 @@
<li><a href="<%= $arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li>
<% end -%>
</ul>
-
- <% if current_user.andand.is_active %>
- <ul class="nav">
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- Access <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li><%= link_to 'Keys', authorized_keys_path %></li>
- <li><%= link_to 'VMs', virtual_machines_path %></li>
- <li><%= link_to 'Repositories', repositories_path %></li>
- <li><%= link_to 'API Tokens', api_client_authorizations_path %></li>
- </ul>
- </li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- Compute <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li><%= link_to 'Jobs', jobs_path %></li>
- <li><%= link_to 'Pipeline instances', pipeline_instances_path %></li>
- <li><%= link_to 'Pipeline templates', pipeline_templates_path %></li>
- </ul>
- </li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- Data <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li><%= link_to 'Collections', collections_path %></li>
- <li><%= link_to 'Links', links_path %></li>
- <li><%= link_to 'Humans', humans_path %></li>
- <li><%= link_to 'Specimens', specimens_path %></li>
- <li><%= link_to 'Traits', traits_path %></li>
- </ul>
- </li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- System <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <% if current_user.is_admin %>
- <li><%= link_to 'Users', users_path %></li>
- <% end %>
- <li><%= link_to 'Groups', groups_path %></li>
- <li><%= link_to 'Compute nodes', nodes_path %></li>
- <li><%= link_to 'Keep disks', keep_disks_path %></li>
- </ul>
- </li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- Docs <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li><%= link_to 'Tutorials and User guide', "#{Rails.configuration.arvados_docsite}/user", target: "_blank" %></li>
- <li><%= link_to 'API Reference', "#{Rails.configuration.arvados_docsite}/api", target: "_blank" %></li>
- <li><%= link_to 'Admin guide', "#{Rails.configuration.arvados_docsite}/admin", target: "_blank" %></li>
- <li><%= link_to 'Install guide', "#{Rails.configuration.arvados_docsite}/install", target: "_blank" %></li>
- </ul>
- </li>
-
- </ul>
- <% end %>
</div>
</div>
<div class="container">
- <%= content_for?(:breadcrumbs) ? yield(:breadcrumbs) : render(partial: 'breadcrumbs') %>
-
<div class="body-content">
<%= yield %>
</div>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list