[ARVADOS] updated: aa0b1d304248ee224f2b32784e2a8857969f9a18

[git at public.curoverse.com]

Summary of changes:
 .../app/views/users/_setup_popup.html.erb          |   13 +++++--------
 .../workbench/app/views/users/_show_admin.html.erb |    2 +-
 apps/workbench/app/views/users/setup_popup.js.erb  |    7 +------
 apps/workbench/config/routes.rb                    |    4 ++--
 4 files changed, 9 insertions(+), 17 deletions(-)

       via  aa0b1d304248ee224f2b32784e2a8857969f9a18 (commit)
      from  7bad9628b44c4f7bbdcfa3649110fa535c7b2aa3 (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 aa0b1d304248ee224f2b32784e2a8857969f9a18
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Mon Mar 31 17:54:32 2014 -0400

    Working on setup popup

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index b6e9e00..1005f21 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -4,12 +4,9 @@
   </div>
 
   <div class="modal-body">
-       <form method="POST" class="form-horizontal" onsubmit="return false">
-           <input id="repository_name" maxlength="250" name="repositoryname" type="text">
-       </form>
+  <%= form_tag setup_user_url(id: @object.uuid), method: 'get', remote: true, class: 'form-search' do %>
+      <input id="repo_name" maxlength="250" name="repo_name" type="text">
+      <button type="submit" class="btn">Submit</button>
+      <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>  </div>  
+  <% end %>
   </div>
-  <div class="modal-footer">
-    <button id="save-button" class="btn" onclick="save_user()">Save</button>
-    <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
-  </div>
-
diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index fd979b8..d9db19c 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -15,6 +15,6 @@ account.</p>
 <p>As an admin, you can setup this user. Please input a VM and repository for the user. If you had previously provided any of these items, they are pre-filled for you and you can leave them as is if you would like to reuse them.</p>
 
 <blockquote>
-<%= link_to "Setup #{@object.full_name}", setup_popup_path,  {class: 'btn btn-primary', :remote => true, 'data-toggle' =>  "modal", 'data-target' => '#modal-window'}  %>
+<%= link_to "Setup #{@object.full_name}", setup_popup_user_url(id: @object.uuid),  {class: 'btn btn-primary', :remote => true, 'data-toggle' =>  "modal", 'data-target' => '#modal-window'}  %>
 <div id="modal-window" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"></div>
 </blockquote>
diff --git a/apps/workbench/app/views/users/setup_popup.js.erb b/apps/workbench/app/views/users/setup_popup.js.erb
index 2eca58b..e725a92 100644
--- a/apps/workbench/app/views/users/setup_popup.js.erb
+++ b/apps/workbench/app/views/users/setup_popup.js.erb
@@ -1,6 +1 @@
-$("#modal-window").html("<%= escape_javascript(render 'setup_popup') %>");
-
-function save_user () {
-  $('#modal-window').modal('hide'); 
-  repo_name = document.getElementById ("repository_name").value;
-};
+$("#modal-window").html("<%= escape_javascript(render partial: 'setup_popup') %>");
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index fbda8d4..43e9bfa 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -7,7 +7,6 @@ ArvadosWorkbench::Application.routes.draw do
     get 'signatures', on: :collection
   end
   get '/user_agreements/signatures' => 'user_agreements#signatures'
-  get 'users/setup_popup' => 'users#setup_popup', :as => :setup_popup
   resources :nodes
   resources :humans
   resources :traits
@@ -24,8 +23,9 @@ ArvadosWorkbench::Application.routes.draw do
     get 'welcome', :on => :collection
     get 'activity', :on => :collection
     post 'sudo', :on => :member
-    post 'setup', :on => :member
     post 'unsetup', :on => :member
+    get 'setup', :on => :member
+    get 'setup_popup', :on => :member
   end
   resources :logs
   resources :factory_jobs

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


hooks/post-receive
--