Merge pull request #1841 from MITx/fix/btalbot/loginregister-actions

Fix/btalbot/loginregister actions

lms/static/sass/multicourse/_account.scss

@@ -391,7 +391,7 @@
     button[type="submit"] {
       @extend .button-primary;
 
-      &:disabled {
+      &:disabled, &.is-disabled {
         opacity: 0.3;
         cursor: default !important;
       }

lms/templates/login.html

@@ -30,6 +30,8 @@
 
     (function() {
       $(document).delegate('#login-form', 'ajax:success', function(data, json, xhr) {
+        $(this).find('.form-actions #submit').addClass('is-disabled');
+
         if(json.success) {
           $('.message.submission-error').removeClass('is-shown');
           toggleSubmitButton();
@@ -51,13 +53,14 @@
     function toggleSubmitButton(e) {
       var $msgError = $('form .status.submission-error');
       var $submitButton = $('form .form-actions #submit');
+      var $submitButtonCopy = $submitButton.html();
 
       if(!$msgError.hasClass('is-shown')) {
-        $submitButton.prop('disabled', true);
+        $submitButton.prop('disabled', true).html('Processing your account information …');
       }
 
       else {
-        $submitButton.prop('disabled', false);
+        $submitButton.prop('disabled', false).html($submitButtonCopy);
       }
     }
   </script>

lms/templates/register.html

@@ -36,6 +36,8 @@
 
     (function() {
      $(document).delegate('#register-form', 'ajax:success', function(data, json, xhr) {
+        $(this).find('.form-actions #submit').addClass('is-disabled');
+
        if(json.success) {
         $('.message.submission-error').removeClass('is-shown');
         toggleSubmitButton();
@@ -52,13 +54,14 @@
     function toggleSubmitButton(e) {
       var $msgError = $('form .status.submission-error');
       var $submitButton = $('form .form-actions #submit').prop('disabled', true);
+      var $submitButtonCopy = $submitButton.html();
 
       if(!$msgError.hasClass('is-shown')) {
-        $submitButton.prop('disabled', true);
+        $submitButton.prop('disabled', true).html('Processing your registration …');
       }
 
       else {
-        $submitButton.prop('disabled', false);
+        $submitButton.prop('disabled', false).html($submitButtonCopy);
       }
     }
   </script>