projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3153-auto-setup-user
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
users
/
_manage_ssh_keys.html.erb
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 e559356f72ea6c635c8961c4eb5492907223dbd0..17b64b27f9f7c7d74141bc55ea52de7ba3b080ff 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,24
+1,23
@@
<div>
<% if !@my_ssh_keys.any? %>
<p> You have not yet set up an SSH public key for use with Arvados. </p>
<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",
"#{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>
<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>
<table class="table manage-ssh-keys-table">
<colgroup>
- <col style="width:
4
5%" />
- <col style="width:
4
5%" />
+ <col style="width:
3
5%" />
+ <col style="width:
5
5%" />
<col style="width: 10%" />
</colgroup>
<thead>
<tr>
<th> Name </th>
<col style="width: 10%" />
</colgroup>
<thead>
<tr>
<th> Name </th>
- <th> Key Finger
P
rint </th>
+ <th> Key Finger
p
rint </th>
<th> </th>
</tr>
</thead>
<th> </th>
</tr>
</thead>
@@
-31,7
+30,13
@@
<td style="word-break:break-all;">
<% if key[:public_key] && key[:public_key].size > 0 %>
<div>
<td style="word-break:break-all;">
<% if key[:public_key] && key[:public_key].size > 0 %>
<div>
- <%= SSHKey.fingerprint key[:public_key] %>
+ <span title="<%=key[:public_key]%>"> <%=
+ begin
+ SSHKey.fingerprint key[:public_key]
+ rescue
+ "INVALID KEY: " + key[:public_key]
+ end
+ %> </span>
</div>
<% else %>
<%= key[:public_key] %>
</div>
<% else %>
<%= key[:public_key] %>