X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/da1c3891473b02f891eaa0af3d9d799ec6b6ed54..5e9787f914dd1a2f762ae7a653fe8dda36f8f555:/apps/workbench/app/views/users/_setup_popup.html.erb?ds=sidebyside

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index c075ab5eb4..4c3a95e87e 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -1,4 +1,8 @@
-<div class="modal-dialog">
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
+<div class="modal-dialog modal-with-loading-spinner">
   <div class="modal-content">
 
     <%= form_tag setup_user_path, {id: 'setup_form', name: 'setup_form', method: 'get',
@@ -6,7 +10,11 @@
 
     <div class="modal-header">
       <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">&times;</button>
-      <h4 class="modal-title">Setup User</h4>
+      <div>
+        <div class="col-sm-6"> <h4 class="modal-title">Setup Account</h4> </div>
+        <div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
+      </div>
+      <br/>
     </div>
 
     <div class="modal-body">
@@ -17,12 +25,12 @@
       <% 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] %>
 
       <input id="user_uuid" maxlength="250" name="user_uuid" type="hidden" value="<%=uuid%>">
       <div class="form-group">
-	<label for="email">Email</label>
+        <label for="email">Email</label>
         <% if disable_email %>
         <input class="form-control" id="email" maxlength="250" name="email" type="text" value="<%=email%>" disabled>
         <% else %>
@@ -36,76 +44,34 @@
                value="<%=identity_url_prefix%>" disabled=true>
         <% else %>
         <input class="form-control" id="openid_prefix" maxlength="250" name="openid_prefix" type="text"
-               value="<%= Rails.configuration.default_openid_prefix %>">
+               value="<%= Rails.configuration.Workbench.DefaultOpenIdPrefix %>">
         <% end %>
       </div>
       <div class="form-group">
-        <label for="repo_name">Repository Name</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>
+        <label for="vm_uuid">Virtual Machine (optional)</label>
         <select class="form-control" name="vm_uuid">
           <option value="" <%= 'selected' unless selected_vm %>>
-	    Choose One:
-	  </option>
+            Choose One:
+          </option>
           <% @vms.each do |vm| %>
             <option value="<%=vm.uuid%>"
-		    <%= 'selected' if selected_vm == vm.uuid %>>
-	      <%= vm.hostname %>
-	    </option>
+              <%= 'selected' if selected_vm == vm.uuid %>>
+              <%= vm.hostname %>
+            </option>
           <% end %>
         </select>
       </div>
+      <div class="groups-group">
+        <label for="groups">Groups for virtual machine (comma separated list) (optional)</label>
+        <input class="form-control" id="groups" maxlength="250" name="groups" type="text" value="<%=groups%>">
+      </div>
     </div>
 
     <div class="modal-footer">
-      <button type="submit" id="register" class="btn btn-primary" autofocus>Submit</button>
       <button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
+      <button type="submit" id="register" class="btn btn-primary" autofocus>Submit</button>
     </div>
 
     <% end #form %>
   </div>
 </div>
-
-<script>
-  var $input = $('input:text'),
-  $register = $('#register');
-
-  var email_disabled = document.forms["setup_form"]["email"].disabled;
-  var email_value = document.forms["setup_form"]["email"].value;
-  var prefix_value = document.forms["setup_form"]["openid_prefix"].value;
-  if ((email_disabled == false) && (email_value == null || email_value == "" || 
-        prefix_value == null || prefix_value == "")) {
-    $register.attr('disabled', true);
-  }
-
-  $input.keyup(function() {
-    var trigger = false;
-
-    var email_disabled = document.forms["setup_form"]["email"].disabled;
-    var email_value = document.forms["setup_form"]["email"].value;
-    var prefix_value = document.forms["setup_form"]["openid_prefix"].value;
-
-    var emailRegExp = /^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/;
-    var validEmail = false;
-    if (emailRegExp.test(email_value )) {
-      validEmail = true;
-    }
-
-    if ((email_disabled == false) && (!validEmail || email_value == null || 
-            email_value == "" || prefix_value == null || prefix_value == "")){
-      trigger = true;
-    }
-
-    trigger ? $register.attr('disabled', true) : $register.removeAttr('disabled');
-  });
-
-  function reset_form() {
-    $('#email').val("");
-    $('#openid_prefix').val("");
-    $('#repo_name').val("");
-    $('select').val('')
-  }
-
-</script>