[ARVADOS] updated: 4ec2f44338e79033045f798f585e083777d7f9ee
git at public.curoverse.com
git at public.curoverse.com
Fri Dec 27 12:05:22 EST 2013
Summary of changes:
.../app/views/layouts/application.html.erb | 113 ++++++++++---------
apps/workbench/app/views/users/home.html.erb | 1 -
doc/user/getting_started/workbench.textile | 2 +-
3 files changed, 60 insertions(+), 56 deletions(-)
via 4ec2f44338e79033045f798f585e083777d7f9ee (commit)
from 42db7b0f5120a762bcb061f04116bba792706de5 (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 4ec2f44338e79033045f798f585e083777d7f9ee
Author: Peter Amstutz <peter.amstutz at clinicalfuture.com>
Date: Fri Dec 27 12:05:45 2013 -0500
* Added "Docs" menu to top navbar
* Fixed layout issues with navbar, had to remove "responsive" navbar elements
* Tweaked text of "workbench" user guide page
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 921588a..c295dc3 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -32,48 +32,51 @@
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="/"><%= Rails.configuration.site_name rescue Rails.application.class.parent_name %></a>
- <div class="nav-collapse collapse">
- <% 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 'Humans', humans_path %></li>
- <li><%= link_to 'Traits', traits_path %></li>
- </ul>
- </li>
- <% if current_user.is_admin %>
+ <a class="brand" style="margin-left: 1px" href="/"><%= Rails.configuration.site_name rescue Rails.application.class.parent_name %></a>
+
+ <ul class="nav pull-right">
+ <% 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>
+ <% else -%>
+ <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 'Humans', humans_path %></li>
+ <li><%= link_to 'Traits', traits_path %></li>
+ </ul>
+ </li>
+ <% if current_user.is_admin %>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Admin <b class="caret"></b>
@@ -84,19 +87,21 @@
<li><%= link_to 'Nodes', nodes_path %></li>
</ul>
</li>
- <% end %>
- </ul>
<% end %>
- <ul class="nav pull-right">
- <% 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>
- <% else -%>
- <li><a href="<%= $arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li>
- <% end -%>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
+ <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', "http://doc.arvados.org/user" %></li>
+ <li><%= link_to 'API Reference', "http://doc.arvados.org/api" %></li>
+ <li><%= link_to 'Admin guide', "http://doc.arvados.org/admin" %></li>
+ <li><%= link_to 'Install guide', "http://doc.arvados.org/install" %></li>
+ </ul>
+ </li>
+
+ </ul>
+ <% end %>
</div>
</div>
diff --git a/apps/workbench/app/views/users/home.html.erb b/apps/workbench/app/views/users/home.html.erb
index 7c4c707..c0b72ec 100644
--- a/apps/workbench/app/views/users/home.html.erb
+++ b/apps/workbench/app/views/users/home.html.erb
@@ -74,7 +74,6 @@
<%= link_to "Click here to learn how to run an Arvados Crunch pipeline.", "http://doc.arvados.org/user/tutorials/tutorial-new-pipeline.html", class: "alert-link" %>
</p>
</div>
-
<% end %>
<div class="row-fluid">
diff --git a/doc/user/getting_started/workbench.textile b/doc/user/getting_started/workbench.textile
index c5f102c..cbe0e35 100644
--- a/doc/user/getting_started/workbench.textile
+++ b/doc/user/getting_started/workbench.textile
@@ -11,7 +11,7 @@ Access the Arvados beta test instance available using this link:
"https://workbench.{{ site.arvados_api_host }}/":https://workbench.{{ site.arvados_api_host }}/
-If you are accessing Arvados for the first time, you will be asked to log in using a Google account. Arvados uses Google services only for identification, and will never access any personal information. Once you are logged in, the Workbench page may indicate your account status is *New / inactive*. If this is the case, contact the administrator of the Arvados instance to activate your account.
+If you are accessing Arvados for the first time, you will be asked to log in using a Google account. Arvados uses only your name and email address from Google services for identification, and will never access any personal information. Once you are logged in, the Workbench page may indicate your account status is *New / inactive*. If this is the case, contact the administrator of the Arvados instance to activate your account.
Once your account is active, logging in to the Workbench will present you with a system status dashboard. This gives a summary of data, configuration, and activity in the Arvados instance.
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list