[ARVADOS] updated: dc3ecef74c3d69329bfa20ea6b81ff9c9488bca8
git at public.curoverse.com
git at public.curoverse.com
Tue Jul 29 15:32:10 EDT 2014
Summary of changes:
.../app/views/users/_manage_account.html.erb | 15 ++++----
.../_manage_setting_up_ssh_access.html.erb} | 10 +++---
.../app/views/users/_manage_ssh_keys.html.erb | 41 +++-------------------
.../app/views/users/add_ssh_key_popup.js.erb | 2 +-
4 files changed, 20 insertions(+), 48 deletions(-)
copy apps/workbench/app/views/{virtual_machines/_show_help.html.erb => users/_manage_setting_up_ssh_access.html.erb} (60%)
via dc3ecef74c3d69329bfa20ea6b81ff9c9488bca8 (commit)
via 656cf0fc10b40f6a9a76a24bae12f189dffae5e5 (commit)
from a2efd7925361ae71ee2abae987fa1b4801ac0555 (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 dc3ecef74c3d69329bfa20ea6b81ff9c9488bca8
Author: radhika <radhika at curoverse.com>
Date: Tue Jul 29 15:31:44 2014 -0400
3193: split ssh section into two sections
diff --git a/apps/workbench/app/views/users/_manage_account.html.erb b/apps/workbench/app/views/users/_manage_account.html.erb
index 6d3d8f7..362abed 100644
--- a/apps/workbench/app/views/users/_manage_account.html.erb
+++ b/apps/workbench/app/views/users/_manage_account.html.erb
@@ -23,15 +23,18 @@
</div>
<div class="col-sm-6">
<div class="panel-group" id="arv-adv-accordion">
- <% ['SSH Keys'].each do |section| %>
+ <% ['SSH Keys',
+ 'Setting up SSH access'].each do |section| %>
<% section_id = section.gsub(" ","_").downcase %>
<div class="panel panel-default">
<div class="panel-heading">
- <div class="pull-right">
- <%= link_to "Add new SSH key", add_ssh_key_popup_url,
- {class: 'btn btn-xs btn-primary', :remote => true, 'data-toggle' => "modal",
- 'data-target' => '#add-ssh-key-modal-window'} %>
- </div>
+ <% if section_id == 'ssh_keys' %>
+ <div class="pull-right">
+ <%= link_to "Add new SSH key", add_ssh_key_popup_url,
+ {class: 'btn btn-xs btn-primary', :remote => true, 'data-toggle' => "modal",
+ 'data-target' => '#add-ssh-key-modal-window'} %>
+ </div>
+ <% end %>
<h4 class="panel-title">
<a data-parent="#arv-adv-accordion" href="#manage_<%=section_id%>">
<%= section %>
diff --git a/apps/workbench/app/views/users/_manage_setting_up_ssh_access.html.erb b/apps/workbench/app/views/users/_manage_setting_up_ssh_access.html.erb
new file mode 100644
index 0000000..903fc7f
--- /dev/null
+++ b/apps/workbench/app/views/users/_manage_setting_up_ssh_access.html.erb
@@ -0,0 +1,28 @@
+<div>
+<p>
+Sample <code>~/.ssh/config</code>:
+</p>
+
+<pre>
+Host *.arvados
+ ProxyCommand ssh -p2222 turnout at switchyard.<%= current_api_host || 'xyzzy.arvadosapi.com' %> -x -a $SSH_PROXY_FLAGS %h
+<% if @my_vm_logins.andand.first %>
+ User <%= @my_vm_logins[@my_vm_logins.andand.keys.first].andand.first %>
+<% end %>
+</pre>
+
+<p>
+Sample login command:
+</p>
+
+<pre>
+ssh <%= @my_virtual_machines.first.andand.hostname.andand.sub('.'+current_api_host,'') or 'vm-hostname' %>.arvados
+</pre>
+
+<p>
+ See also:
+ <%= link_to raw('Arvados Docs → User Guide → SSH access'),
+ "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
+ target: "_blank"%>.
+</p>
+</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 4384041..c8a68a8 100644
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -1,5 +1,4 @@
<div>
-<h4>Add / Delete SSH Keys</h4>
<% 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.",
@@ -43,35 +42,3 @@
</table>
<% end %>
</div>
-
-<hr>
-
-<div>
-<h4>Setting up SSH access</h4>
-<p>
-Sample <code>~/.ssh/config</code>:
-</p>
-
-<pre>
-Host *.arvados
- ProxyCommand ssh -p2222 turnout at switchyard.<%= current_api_host || 'xyzzy.arvadosapi.com' %> -x -a $SSH_PROXY_FLAGS %h
-<% if @my_vm_logins.andand.first %>
- User <%= @my_vm_logins[@my_vm_logins.andand.keys.first].andand.first %>
-<% end %>
-</pre>
-
-<p>
-Sample login command:
-</p>
-
-<pre>
-ssh <%= @my_virtual_machines.first.andand.hostname.andand.sub('.'+current_api_host,'') or 'vm-hostname' %>.arvados
-</pre>
-
-<p>
- See also:
- <%= link_to raw('Arvados Docs → User Guide → SSH access'),
- "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
- target: "_blank"%>.
-</p>
-</div>
diff --git a/apps/workbench/app/views/users/add_ssh_key_popup.js.erb b/apps/workbench/app/views/users/add_ssh_key_popup.js.erb
index 96f6123..148c0b2 100644
--- a/apps/workbench/app/views/users/add_ssh_key_popup.js.erb
+++ b/apps/workbench/app/views/users/add_ssh_key_popup.js.erb
@@ -12,7 +12,7 @@ if ((name_value == null || name_value == "" ||
}
// capture events to enable submit button when applicable
-$input.on('keyup paste mouseleave', function() {
+$input.on('keyup paste mouseleave onblur', function() {
var trigger = false;
var name_value = document.forms["add_new_key_form"]["name"].value;
commit 656cf0fc10b40f6a9a76a24bae12f189dffae5e5
Author: radhika <radhika at curoverse.com>
Date: Tue Jul 29 15:15:01 2014 -0400
3193: show only a portion of the ssh key so that the page does not have to scroll too far down when there are multiple ssh keys configured.
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 44dc660..4384041 100644
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -10,7 +10,7 @@
<% end %>
<% if @my_ssh_keys.andand.any? %>
- <table class="table virtual-machines-table">
+ <table class="table virtual-machines-table" style="table-layout:fixed; overflow:hidden; white-space: nowrap;">
<colgroup>
<col style="width: 15%" />
<col style="width: 80%" />
@@ -26,14 +26,14 @@
<tbody>
<% @my_ssh_keys.andand.each do |key| %>
<tr>
- <td style="word-break:break-all;">
+ <td style="width:50px; overflow:hidden;">
<%= key[:name] %>
</td>
- <td style="word-break:break-all;">
+ <td style="width:100px; overflow:hidden;">
<%= key[:public_key] %>
</td>
<td>
- <%= link_to(authorized_key_path(id: key[:uuid]), method: 'delete', class: 'btn btn-sm', data: {confirm: "Really delete key?"}) do %>
+ <%= link_to(authorized_key_path(id: key[:uuid]), method: 'delete', class: 'btn btn-sm', data: {confirm: "Really delete key"}) do %>
<i class="fa fa-fw fa-trash-o"></i>
<% end %>
</td>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list