3193: add plus icon to add ssh key button

diff --git a/apps/workbench/app/views/users/_manage_account.html.erb b/apps/workbench/app/views/users/_manage_account.html.erb
index 309d98221788adf3fcc626b5cc73e45b380e9484..f247a3d89ab5164325eec73fd3ccac9a310951fc 100644 (file)
--- a/apps/workbench/app/views/users/_manage_account.html.erb
+++ b/apps/workbench/app/views/users/_manage_account.html.erb
@@ -29,7 +29,7 @@
         <div class="panel-heading">
           <% if section_id == 'ssh_keys' %>
             <div class="pull-right">
-              <%= link_to "Add new SSH key", add_ssh_key_popup_url,
+              <%= link_to raw('<i class="fa fa-plus"></i>' "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>

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 3612d1db54f7ae650e16a06a15c5f8932cd0bacd..580b5d89db95a8340cf3a24ef19c999332894099 100644 (file)
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -11,9 +11,9 @@
   <% if @my_ssh_keys.andand.any? %>
     <table class="table manage-ssh-keys-table" style="table-layout:fixed; overflow:hidden; white-space: nowrap;">
       <colgroup>
-        <col style="width: 40%" />
-        <col style="width: 55%" />
-        <col style="width: 5%" />
+        <col style="width: 45%" />
+        <col style="width: 45%" />
+        <col style="width: 10%" />
       </colgroup>
       <thead>
         <tr>
@@ -31,7 +31,7 @@
             <td>
               <% if key[:public_key] && key[:public_key].size > 0 %>
                 <div>
-                  <pre style="margin:0; overflow-x:scroll"> <%= key[:public_key] %> </pre>
+                  <pre style="margin:0; overflow-y:scroll; max-height:7em"><%= key[:public_key] %></pre>
                 </div>
               <% else %>
                   <%= key[:public_key] %>