Merge "Bug 1737581: Disable copy collection button after first click"

htdocs/js/mahara.js

@@ -139,7 +139,7 @@ function formStartProcessing(form, btn) {
     processingStart();
     var button = jQuery(btn);
     if (button.length) {
-        button.val(get_string('processing') + ' ...');
+        button.text(get_string('processing') + ' ...');
 
         // we add a hidden input field so the "disabled" button still gets to
         // pass its value through
@@ -149,7 +149,7 @@ function formStartProcessing(form, btn) {
         });
         button.after(node);
 
-        button.attr('disabled', true);
+        button.prop('disabled', true);
         button.blur();
 
         // Start the progress meter if it is enabled.

htdocs/js/viewmenu.js

@@ -110,9 +110,13 @@ jQuery(function($) {
     $("#copy-view-button").on('click', function() {
         // drop the collection bit from the url
         var url = copyurl.replace(/collection=(.*)/, '');
+        $(this).text(get_string('processing') + ' ...').prop('disabled', true).blur();
+        processingStart();
         window.location = url;
     });
     $("#copy-collection-button").on('click', function() {
+        $(this).text(get_string('processing') + ' ...').prop('disabled', true).blur();
+        processingStart();
         window.location = copyurl;
     });
 

htdocs/theme/raw/sass/components/_loading-inner.scss

@@ -6,5 +6,4 @@
 }
 .loading-message {
     margin-left: 5px;
-    display: none;
 }
\ No newline at end of file

htdocs/theme/raw/templates/header.tpl

@@ -55,7 +55,7 @@
                             <a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="administration"}</a>
                         </div>
                     {/if}
-                    <div id="loading-box" class="loading-box" style='display:none'></div>
+                    <div id="loading-box" class="loading-box hidden"></div>
                 </div>
                 <div class="nav-toggle-area">
                     {if $MAINNAV}

htdocs/theme/raw_old/sass/components/_loading-inner.scss

@@ -6,5 +6,4 @@
 }
 .loading-message {
     margin-left: 5px;
-    display: none;
 }
\ No newline at end of file

htdocs/theme/raw_old/templates/header.tpl

@@ -49,7 +49,7 @@
                         <img src="{$sitelogosmall}" alt="{$sitename}">
                     </a>
                 {/if}
-                <div id="loading-box" class="loading-box" style='display:none'></div>
+                <div id="loading-box" class="loading-box hidden"></div>
             </div>
             {if $MAINNAV}
              <!-- Brand and toggle get grouped for better mobile display -->