Merge branch '3193-manage-account' of git.curoverse.com:arvados into 3193-manage...

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

diff --git a/apps/workbench/app/views/users/_manage_account.html.erb b/apps/workbench/app/views/users/_manage_account.html.erb
index 76a0408e0a3cf28db70d9a86951fd441ea644801..309d98221788adf3fcc626b5cc73e45b380e9484 100644 (file)
--- a/apps/workbench/app/views/users/_manage_account.html.erb
+++ b/apps/workbench/app/views/users/_manage_account.html.erb
@@ -1,8 +1,7 @@
 <div class="col-sm-6">
   <div class="panel-group" id="arv-adv-accordion">
     <% ['Virtual Machines',
-       'Repositories',
-       'Current Token'].each do |section| %>
+       'Repositories'].each do |section| %>
       <% section_id = section.gsub(" ","_").downcase %>
       <div class="panel panel-default">
         <div class="panel-heading">
@@ -23,17 +22,18 @@
 </div>
 <div class="col-sm-6">
   <div class="panel-group" id="arv-adv-accordion">
-    <% ['SSH Keys'].each do |section| %>
+    <% ['SSH Keys',
+      'Current Token'].each do |section| %>
       <% section_id = section.gsub(" ","_").downcase %>
       <div class="panel panel-default">
         <div class="panel-heading">
-          <div class="pull-right">
-            <%= button_to projects_path(method: 'post'), class: 'btn btn-xs btn-primary' do %>
-              <i class="fa fa-fw fa-plus"></i>
-              Add new SSH key
-            <% end %>
-
-          </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 %>
@@ -48,4 +48,5 @@
       </div>
     <% end %>
   </div>
+  <div id="add-ssh-key-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
 </div>