[ARVADOS] created: 6aac88a912ded276ed151501ac3977cfcc78600d

[git at public.curoverse.com]

        at  6aac88a912ded276ed151501ac3977cfcc78600d (commit)


commit 6aac88a912ded276ed151501ac3977cfcc78600d
Author: radhika <radhika at curoverse.com>
Date:   Thu Jul 23 09:55:02 2015 -0400

    6588: split manage account

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 4cf1fff..84d6cfd 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -297,6 +297,7 @@ class UsersController < ApplicationController
     # current user's ssh keys
     @my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: current_user.uuid)
 
+    @page = params["page"]
     respond_to do |f|
       f.html { render template: 'users/manage_account' }
     end
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 0f90c41..a32b41c 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -56,7 +56,14 @@
                 </li>
                 <% if current_user.is_active %>
                 <li role="menuitem"><a href="/projects/<%=current_user.uuid%>" role="menuitem"><i class="fa fa-home fa-fw"></i> Home project </a></li>
+
+                <li role="menuitem"><%= link_to raw('<i class="fa fa-key fa-fw"></i> Virtual Machines'), manage_account_path(page: "manage_virtual_machines") %></li>
+                <li role="menuitem"><%= link_to raw('<i class="fa fa-key fa-fw"></i> Repositories'), manage_account_path(page: "manage_repositories") %></li>
+                <li role="menuitem"><%= link_to raw('<i class="fa fa-key fa-fw"></i> SSH Keys'), manage_account_path(page: "manage_ssh_keys") %></li>
+                <li role="menuitem"><%= link_to raw('<i class="fa fa-key fa-fw"></i> Current Token'), manage_account_path(page: "manage_current_token") %></li>
+
                 <li role="menuitem"><a href="/manage_account" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage account</a></li>
+
                 <% if Rails.configuration.user_profile_form_fields %>
                   <li role="menuitem"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage profile</a></li>
                 <% end %>
diff --git a/apps/workbench/app/views/users/_manage_account.html.erb b/apps/workbench/app/views/users/_manage_account.html.erb
index 4a362cd..196e85e 100644
--- a/apps/workbench/app/views/users/_manage_account.html.erb
+++ b/apps/workbench/app/views/users/_manage_account.html.erb
@@ -1,3 +1,7 @@
+<% if @page %>
+  <div>
+    <%= render partial: @page %>
+<% else %>
 <div class="col-sm-6">
   <div class="panel-group" id="arv-adv-accordion">
     <div class="panel panel-default">
@@ -17,6 +21,7 @@
       <%= render partial: "manage_current_token" %>
     </div>
   </div>
+<% end %>
   <div id="add-ssh-key-modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
   <%= render partial: "add_repository_modal" %>
 </div>

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


hooks/post-receive
--