Merge branch '3627-selectable-projects' closes #3627

[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 c075ab5eb4f87f7e8184ad74637ae769a3b2d09b..e9429cf451d43b8c48e601be3d7cb97824fa8adf 100644 (file)
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -1,4 +1,4 @@
-<div class="modal-dialog">
+<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 +6,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 User</h4> </div>
+        <div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
+      </div>
+      <br/>
     </div>
 
     <div class="modal-body">
@@ -40,7 +44,7 @@
         <% end %>
       </div>
       <div class="form-group">
-        <label for="repo_name">Repository Name</label>
+        <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">
@@ -67,45 +71,3 @@
     <% 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>