1) Rename "Cancel All" -> "Cancel uploads" to clarify what we're

   talking about and follow our capitalization standards.
2) Grey out the Done button when uploads are in progress.
Fixes ticket #1302.

2 files changed, 10 insertions, 1 deletions

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 9bd02f9b..96cc0e26 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -21,12 +21,18 @@
         $("#g-upload-cancel-all")
           .addClass("ui-state-disabled")
           .attr("disabled", "disabled");
+        $("#g-upload-done")
+          .removeClass("ui-state-disabled")
+          .attr("disabled", null);
         return true;
       },
       onClearQueue: function(event) {
         $("#g-upload-cancel-all")
           .addClass("ui-state-disabled")
           .attr("disabled", "disabled");
+        $("#g-upload-done")
+          .removeClass("ui-state-disabled")
+          .attr("disabled", null);
         return true;
       },
       onComplete: function(event, queueID, fileObj, response, data) {
@@ -71,6 +77,9 @@
           $("#g-upload-cancel-all")
             .removeClass("ui-state-disabled")
             .attr("disabled", null);
+          $("#g-upload-done")
+            .addClass("ui-state-disabled")
+            .attr("disabled", "disabled");
         }
         return true;
       }
diff --git a/modules/gallery/views/form_uploadify_buttons.html.php b/modules/gallery/views/form_uploadify_buttons.html.php
index d88bb6aa..98729bd7 100644
--- a/modules/gallery/views/form_uploadify_buttons.html.php
+++ b/modules/gallery/views/form_uploadify_buttons.html.php
@@ -4,5 +4,5 @@
   <?= t("Done") ?>
 </button>
 <button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled">
-  <?= t("Cancel All") ?>
+  <?= t("Cancel uploads") ?>
 </button>