Merge branch 'master' into 6588-documentation

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

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index 705d2d793b50c78787f81a711449fcbb64e82b0a..36869cde2f52ba30e1b75a7993e3697f3b2e7529 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -7,7 +7,7 @@
     <div class="modal-header">
       <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">&times;</button>
       <div>
-        <div class="col-sm-6"> <h4 class="modal-title">Setup User</h4> </div>
+        <div class="col-sm-6"> <h4 class="modal-title">Setup Shell Account</h4> </div>
         <div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
       </div>
       <br/>
@@ -21,7 +21,6 @@
       <% disable_email = uuid != nil %>
       <% identity_url_prefix = @current_selections[:identity_url_prefix] %>
       <% disable_url_prefix = identity_url_prefix != nil %>
-      <% selected_repo = @current_selections[:repo_name] %>
       <% selected_vm = @current_selections[:vm_uuid] %>
       <% groups = @current_selections[:groups] %>
 
@@ -44,10 +43,6 @@
                value="<%= Rails.configuration.default_openid_prefix %>">
         <% end %>
       </div>
-      <div class="form-group">
-        <label for="repo_name">Repository Name and Shell Login</label>
-        <input class="form-control" id="repo_name" maxlength="250" name="repo_name" type="text" value="<%=selected_repo%>">
-      </div>
       <div class="form-group">
         <label for="vm_uuid">Virtual Machine</label>
         <select class="form-control" name="vm_uuid">
@@ -63,11 +58,8 @@
         </select>
       </div>
       <div class="groups-group">
-        <label for="groups">Groups</label>
-        <input user_email="user_email" maxlength="250" name="user_email" type="hidden" value="<%=email%>">
-        <input prev_groups="prev_groups" maxlength="250" name="prev_groups" type="hidden" value="<%=groups%>">
-        <input class="form-control" id="groups" maxlength="250" name="groups" type="text" value="<%=groups%>"
-          title="Comma separated list of groups to which this user belongs">
+        <label for="groups">Groups for virtual machine (comma separated list)</label>
+        <input class="form-control" id="groups" maxlength="250" name="groups" type="text" value="<%=groups%>">
       </div>
     </div>