[ARVADOS] updated: 41eef732f874de82310e36bda7f4a86100fd4484
git at public.curoverse.com
git at public.curoverse.com
Wed Apr 23 21:31:56 EDT 2014
Summary of changes:
.../app/views/layouts/application.html.erb | 34 ++++++++------
apps/workbench/app/views/users/_home.html.erb | 48 ++++++++++++++++++++
2 files changed, 67 insertions(+), 15 deletions(-)
via 41eef732f874de82310e36bda7f4a86100fd4484 (commit)
from a6d40dfb3aa319d86114a691a3709c12b809e6f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 41eef732f874de82310e36bda7f4a86100fd4484
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Apr 23 21:31:45 2014 -0400
Experiment with horizontal layout menu.
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index fd3f76b..8f07aee 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -52,6 +52,11 @@
display: none;
}
}
+
+ .brand-menu-button:hover {
+ background-color: #DDD;
+ }
+
</style>
</head>
<body>
@@ -66,15 +71,12 @@
<span class="icon-bar"></span>
</button>
- <a href="#" class="navbar-brand dropdown-toggle" data-toggle="dropdown" id="user-menu">
+ <a href="#" class="navbar-brand dropdown-toggle " data-toggle="dropdown" id="user-menu">
<%= Rails.configuration.site_name rescue Rails.application.class.parent_name %>
</a>
- <ul class="dropdown-menu" role="menu">
-
- <li class="<%= 'arvados-nav-active' if params[:action] == 'home' %>">
- <a href="/">Dashboard</a>
- </li>
+ <ul class="dropdown-menu" role="menu" style="left: 5%; width:90%">
+ <span class="row" style="margin-top: -2em">
<% [['Data', [['collections', 'Collections (data files)'],
['humans'],
['traits'],
@@ -89,8 +91,8 @@
['groups'],
['nodes', 'Compute nodes'],
['keep_disks']]]].each do |j| %>
+ <span class="col-sm-2">
<li class="dropdown-header"><%= j[0] %></li>
- <li>
<% 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') %>">
@@ -100,22 +102,24 @@
</li>
<% end %>
<% end %>
- </li>
- <li class="divider"></li>
+ </span>
<% end %>
- <li class="dropdown-header">Help</li>
- <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>
-
+ <span class="col-sm-2">
+ <li class="dropdown-header">Help</li>
+ <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>
+ </span>
+ </span>
</ul>
</div>
<div class="collapse navbar-collapse" id="workbench-navbar">
<ul class="nav navbar-nav navbar-left breadcrumbs">
+ <li> <a href="/">Dashboard</a></li>
<% if current_user %>
<% if content_for?(:breadcrumbs) %>
<%= yield(:breadcrumbs) %>
diff --git a/apps/workbench/app/views/users/_home.html.erb b/apps/workbench/app/views/users/_home.html.erb
index 5e8b3f8..af3b0c9 100644
--- a/apps/workbench/app/views/users/_home.html.erb
+++ b/apps/workbench/app/views/users/_home.html.erb
@@ -25,8 +25,56 @@
.daxalert {
overflow: hidden;
}
+
+ .negmargin:before {
+ content: "";
+ margin-top: -2em;
+ }
<% end %>
+ <ul style="left: 5%; width:90%">
+
+ <span class="row negmargin">
+ <span class="col-sm-1"></span>
+ <% [['Data', [['collections', 'Collections (data files)'],
+ ['humans'],
+ ['traits'],
+ ['specimens'],
+ ['links']]],
+ ['Activity', [['pipeline_instances', 'Recent pipeline instances'],
+ ['jobs', 'Recent jobs']]],
+ ['Compute', [['pipeline_templates'],
+ ['repositories', 'Code repositories'],
+ ['virtual_machines']]],
+ ['System', [['users'],
+ ['groups'],
+ ['nodes', 'Compute nodes'],
+ ['keep_disks']]]].each do |j| %>
+ <span class="col-sm-2">
+ <li class="dropdown-header"><%= j[0] %></li>
+ <% 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') %>">
+ <a href="/<%= k[0] %>">
+ <%= if k[1] then k[1] else k[0].capitalize.gsub('_', ' ') end %>
+ </a>
+ </li>
+ <% end %>
+ <% end %>
+ </span>
+ <% end %>
+
+ <span class="col-sm-2">
+ <li class="dropdown-header">Help</li>
+ <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>
+ </span>
+ </span>
+ </ul>
+
+
<div class="container-fluid" id="home-tables">
<%= render :partial => 'tables' %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list