Merge branch 'master' into 3193-manage-account

[arvados.git] / apps / workbench / app / views / users / _manage_virtual_machines.html.erb

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 b19e719a7b9e12e9734dd27786ba86a47f857e98..a3191c2085ef6f2c2ce1829c71c36da4b64a786f 100644 (file)
--- a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
+++ b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
@@ -1,7 +1,7 @@
 <div>
   <p>
-    For more information see <%= link_to raw('setting up SSH access'),
-    "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html", target: "_blank"%>
+    For more information see <%= link_to raw('Setting up SSH access'),
+    "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html", target: "_blank"%>.
   </p>
 
   <table class="table virtual-machines-table">
@@ -22,10 +22,22 @@
             <%= vm[:hostname] %>
           </td>
           <td style="word-break:break-all;">
-            <%= @my_vm_logins[vm[:uuid]].andand.compact || [] %>
+            <%= @my_vm_logins[vm[:uuid]].andand.compact.andand.join(", ") %>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
+
+  <%
+    login_name = @my_vm_logins[@my_vm_logins.andand.keys.first].andand.first
+    api_host = @my_virtual_machines.first.andand.hostname.andand.sub('.'+current_api_host,'')
+    if (login_name && api_host)
+  %>
+    <p>
+      To log in to <b><%=api_host%></b> using the login name <b><%=login_name%></b>, use <b><%=login_name%>@<%=api_host%>.arvados</b>.
+      Please see the <b>Setting up SSH access</b> section to the right for more detail.
+    </p>
+  <% end %>
+
 </div>