[ARVADOS] updated: 2afb2391969061c5504e7224f38ab9e5d7bfd023

[git at public.curoverse.com]

Summary of changes:
 .../app/views/users/_add_ssh_key_popup.html.erb    |  2 +-
 .../app/views/users/_manage_ssh_keys.html.erb      | 49 ++++++++++++++--------
 2 files changed, 32 insertions(+), 19 deletions(-)

       via  2afb2391969061c5504e7224f38ab9e5d7bfd023 (commit)
       via  aead83a0bf17c6fd738a15e5a467c1b02274131e (commit)
      from  635dc811d13d8a4348a0c8a047ae6b6a4ee58aa7 (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 2afb2391969061c5504e7224f38ab9e5d7bfd023
Author: radhika <radhika at curoverse.com>
Date:   Fri Jul 25 14:11:17 2014 -0400

    3193: Show name column in the ssh key section.

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 8e069dc..8c436d6 100644
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -9,26 +9,39 @@
      <p> When you have an SSH key you would like to use, add it using the <b>Add</b> button. </p>
   <% end %>
 
-  <table class="table virtual-machines-table">
-    <colgroup>
-      <col style="width: 95%" />
-      <col style="width: 5%" />
-    </colgroup>
-    <tbody>
-      <% @my_ssh_keys.andand.each do |key| %>
+  <% if @my_ssh_keys.andand.any? %>
+    <table class="table virtual-machines-table">
+      <colgroup>
+        <col style="width: 15%" />
+        <col style="width: 80%" />
+        <col style="width: 5%" />
+      </colgroup>
+      <thead>
         <tr>
-          <td style="word-break:break-all;">
-            <%= 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 %>
-                <i class="fa fa-fw fa-trash-o"></i>
-            <% end %>
-          </td>
+          <th> Name </th>
+          <th> Public Key </th>
+          <th> </th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @my_ssh_keys.andand.each do |key| %>
+          <tr>
+            <td style="word-break:break-all;">
+              <%= key[:name] %>
+            </td>
+            <td style="word-break:break-all;">
+              <%= 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 %>
+                  <i class="fa fa-fw fa-trash-o"></i>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% end %>
 </div>
 
 <hr>

commit aead83a0bf17c6fd738a15e5a467c1b02274131e
Author: radhika <radhika at curoverse.com>
Date:   Fri Jul 25 13:39:06 2014 -0400

    3193: disable submit button in popup if either name or public key are empty.

diff --git a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
index 147bbe8..283154f 100644
--- a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
+++ b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
@@ -1,7 +1,7 @@
 <div class="modal-dialog modal-with-loading-spinner">
   <div class="modal-content">
 
-    <%= form_tag add_ssh_key_path, {method: 'get', class: 'form-search, new_authorized_key', remote: true} do %>
+    <%= form_tag add_ssh_key_path, {method: 'get', id: 'add_new_key_form', name: 'add_new_key_form', class: 'form-search, new_authorized_key', remote: true} do %>
 
       <div class="modal-header">
         <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>

-----------------------------------------------------------------------


hooks/post-receive
--