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 6d3d8f7b2e5022ecaed716fd40f885e19963c979..362abedeff6b1e1ffd6aa7027ffe3c12fcd6dfba 100644 (file)
--- 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 (file)
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@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 &rarr; User Guide &rarr; 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 43840416955404a517bee693ec669011ad185061..c8a68a87d98c9b2aaa6d47a9630b5fa26872d654 100644 (file)
--- 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@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 &rarr; User Guide &rarr; 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 96f61238f7e1cb5017595c23fc43f1e914b1aaeb..148c0b2b5903677cc51ef8d1d248d834d9e1dee9 100644 (file)
--- 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;