[ARVADOS] updated: 5b305bba25a4616fa88377b3fd4871b351caf636
git at public.curoverse.com
git at public.curoverse.com
Thu Jul 31 11:34:13 EDT 2014
Summary of changes:
.../app/views/users/_manage_repositories.html.erb | 60 ++++++++++--------
.../app/views/users/_manage_ssh_keys.html.erb | 9 ++-
.../views/users/_manage_virtual_machines.html.erb | 74 ++++++++++++----------
3 files changed, 75 insertions(+), 68 deletions(-)
via 5b305bba25a4616fa88377b3fd4871b351caf636 (commit)
via f91557687f656e11b9ddad08be2243677ebe6cec (commit)
from 76b8c9664d1f3bd4f1513fa86735f29639d0bb11 (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 5b305bba25a4616fa88377b3fd4871b351caf636
Author: radhika <radhika at curoverse.com>
Date: Thu Jul 31 11:17:12 2014 -0400
3193: minor ui update
diff --git a/apps/workbench/app/views/users/_manage_repositories.html.erb b/apps/workbench/app/views/users/_manage_repositories.html.erb
index 281909f..4f22ae9 100644
--- a/apps/workbench/app/views/users/_manage_repositories.html.erb
+++ b/apps/workbench/app/views/users/_manage_repositories.html.erb
@@ -5,7 +5,7 @@
</p>
<% if !@my_repositories.any? %>
- You do not seem to have access to any repositories. If you would like to request access, please contact your system admin at <b><%= "#{Rails.configuration.activation_contact_link}".split(':')[-1] %></b>
+ You do not seem to have access to any repositories. If you would like to request access, please contact your system admin.
<% else %>
<table class="table repositories-table">
<colgroup>
diff --git a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
index 9fd69dd..7818ad0 100644
--- a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
+++ b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
@@ -6,7 +6,7 @@
</p>
<% if !@my_virtual_machines.any? %>
- You do not seem to have access to any virtual machines. If you would like to request access, please contact your system admin at <b><%= "#{Rails.configuration.activation_contact_link}".split(':')[-1] %></b>
+ You do not seem to have access to any virtual machines. If you would like to request access, please contact your system admin.
<% else %>
<table class="table virtual-machines-table">
<colgroup>
commit f91557687f656e11b9ddad08be2243677ebe6cec
Author: radhika <radhika at curoverse.com>
Date: Thu Jul 31 10:52:09 2014 -0400
3193: add contact admin blurb when the user has no virtual machines and repositories configured.
diff --git a/apps/workbench/app/views/users/_manage_repositories.html.erb b/apps/workbench/app/views/users/_manage_repositories.html.erb
index 037d443..281909f 100644
--- a/apps/workbench/app/views/users/_manage_repositories.html.erb
+++ b/apps/workbench/app/views/users/_manage_repositories.html.erb
@@ -1,36 +1,40 @@
<div>
<p>
For more information see <%= link_to raw('Writing a pipeline'),
- "#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-firstscript.html", target: "_blank"%>
+ "#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-firstscript.html", target: "_blank"%>.
</p>
- <table class="table repositories-table">
- <colgroup>
- <col style="width: 30%" />
- <col style="width: 10%" />
- <col style="width: 60%" />
- </colgroup>
- <thead>
- <tr>
- <th> Name </th>
- <th> Read/Write </th>
- <th> URL </th>
- </tr>
- </thead>
- <tbody>
- <% @my_repositories.andand.each do |repo| %>
+ <% if !@my_repositories.any? %>
+ You do not seem to have access to any repositories. If you would like to request access, please contact your system admin at <b><%= "#{Rails.configuration.activation_contact_link}".split(':')[-1] %></b>
+ <% else %>
+ <table class="table repositories-table">
+ <colgroup>
+ <col style="width: 30%" />
+ <col style="width: 10%" />
+ <col style="width: 60%" />
+ </colgroup>
+ <thead>
<tr>
- <td style="word-break:break-all;">
- <%= repo[:name] %>
- </td>
- <td>
- <%= repo[:push_url] ? 'writable' : 'read-only' %>
- </td>
- <td style="word-break:break-all;">
- <code><%= repo[:fetch_url] %></code>
- </td>
+ <th> Name </th>
+ <th> Read/Write </th>
+ <th> URL </th>
</tr>
- <% end %>
- </tbody>
- </table>
+ </thead>
+ <tbody>
+ <% @my_repositories.andand.each do |repo| %>
+ <tr>
+ <td style="word-break:break-all;">
+ <%= repo[:name] %>
+ </td>
+ <td>
+ <%= repo[:push_url] ? 'writable' : 'read-only' %>
+ </td>
+ <td style="word-break:break-all;">
+ <code><%= repo[:fetch_url] %></code>
+ </td>
+ </tr>
+ <% end %>
+ </tbody>
+ </table>
+ <% end %>
</div>
diff --git a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
index e559356..57edd60 100644
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -1,14 +1,13 @@
<div>
<% if !@my_ssh_keys.any? %>
<p> You have not yet set up an SSH public key for use with Arvados. </p>
- <p> <%= link_to "Click here to learn about SSH keys in Arvados.",
+ <p> <%= link_to "Click here",
"#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
style: "font-weight: bold",
- target: "_blank" %> </p>
+ target: "_blank" %> to learn about SSH keys in Arvados.
+ </p>
<p> When you have an SSH key you would like to use, add it using the <b>Add</b> button. </p>
- <% end %>
-
- <% if @my_ssh_keys.andand.any? %>
+ <% else %>
<table class="table manage-ssh-keys-table">
<colgroup>
<col style="width: 45%" />
diff --git a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
index 8215f1f..9fd69dd 100644
--- a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
+++ b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
@@ -5,43 +5,47 @@
target: "_blank"%>. A sample <i>~/.ssh/config</i> entry is provided below.
</p>
- <table class="table virtual-machines-table">
- <colgroup>
- <col style="width: 25%" />
- <col style="width: 25%" />
- <col style="width: 50%" />
- </colgroup>
- <thead>
- <tr>
- <th> Host name </th>
- <th> Login name </th>
- <th> Command line </th>
- </tr>
- </thead>
- <tbody>
- <% @my_virtual_machines.andand.each do |vm| %>
+ <% if !@my_virtual_machines.any? %>
+ You do not seem to have access to any virtual machines. If you would like to request access, please contact your system admin at <b><%= "#{Rails.configuration.activation_contact_link}".split(':')[-1] %></b>
+ <% else %>
+ <table class="table virtual-machines-table">
+ <colgroup>
+ <col style="width: 25%" />
+ <col style="width: 25%" />
+ <col style="width: 50%" />
+ </colgroup>
+ <thead>
<tr>
- <td style="word-break:break-all;">
- <%= vm[:hostname] %>
- </td>
- <td style="word-break:break-all;">
- <%= @my_vm_logins[vm[:uuid]].andand.compact.andand.join(", ") %>
- </td>
- <td style="word-break:break-all;">
- <% if @my_vm_logins[vm[:uuid]] %>
- <% @my_vm_logins[vm[:uuid]].each do |login| %>
- <code>ssh <%= login %>@<%= vm[:hostname] %>.arvados</code>
- <% end %>
- <% end %>
- </td>
+ <th> Host name </th>
+ <th> Login name </th>
+ <th> Command line </th>
</tr>
- <% end %>
- </tbody>
- </table>
+ </thead>
+ <tbody>
+ <% @my_virtual_machines.andand.each do |vm| %>
+ <tr>
+ <td style="word-break:break-all;">
+ <%= vm[:hostname] %>
+ </td>
+ <td style="word-break:break-all;">
+ <%= @my_vm_logins[vm[:uuid]].andand.compact.andand.join(", ") %>
+ </td>
+ <td style="word-break:break-all;">
+ <% if @my_vm_logins[vm[:uuid]] %>
+ <% @my_vm_logins[vm[:uuid]].each do |login| %>
+ <code>ssh <%= login %>@<%= vm[:hostname] %>.arvados</code>
+ <% end %>
+ <% end %>
+ </td>
+ </tr>
+ <% end %>
+ </tbody>
+ </table>
-<p><i>~/.ssh/config:</i></p>
-<pre>Host *.arvados
- ProxyCommand ssh -p2222 turnout at switchyard.<%= current_api_host || 'xyzzy.arvadosapi.com' %> -x -a $SSH_PROXY_FLAGS %h
-</pre>
+ <p><i>~/.ssh/config:</i></p>
+ <pre>Host *.arvados
+ ProxyCommand ssh -p2222 turnout at switchyard.<%= current_api_host || 'xyzzy.arvadosapi.com' %> -x -a $SSH_PROXY_FLAGS %h
+ </pre>
+ <% end %>
</div>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list