From 201883101595d5954cf45ffac6e2c376e5ecce35 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 16:39:01 -0700
Subject: 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.

---
 modules/gallery/views/form_uploadify_buttons.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/views/form_uploadify_buttons.html.php')

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>
-- 
cgit v1.2.3


From 953d63555c0ddc387eed08af7f23e4180c13ecc6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 30 Aug 2010 22:19:57 -0700
Subject: Detect Flash and put up a reasonable message if your browser doesn't
 have Flash installed.  Fixes ticket #1268.

---
 modules/gallery/views/form_uploadify.html.php      | 230 +++++++++++----------
 .../gallery/views/form_uploadify_buttons.html.php  |  12 +-
 2 files changed, 131 insertions(+), 111 deletions(-)

(limited to 'modules/gallery/views/form_uploadify_buttons.html.php')

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 96cc0e26..2ed7912f 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -2,126 +2,144 @@
 <script type="text/javascript" src="<?= url::file("lib/swfobject.js") ?>"></script>
 <script type="text/javascript" src="<?= url::file("lib/uploadify/jquery.uploadify.min.js") ?>"></script>
 <script type="text/javascript">
+  <? $flash_minimum_version = "9.0.24" ?>
   $("#g-add-photos-canvas").ready(function () {
-    $("#g-uploadify").uploadify({
-      width: 150,
-      height: 33,
-      uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
-      script: "<?= url::site("uploader/add_photo/{$album->id}") ?>",
-      scriptData: <?= json_encode($script_data) ?>,
-      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.GIF;*.JPG;*.JPEG;*.PNG<? if ($movies_allowed): ?>;*.flv;*.mp4;*.m4v;*.FLV;*.MP4;*.M4V<? endif ?>",
-      fileDesc: <?= t("Photos and movies")->for_js() ?>,
-      cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
-      simUploadLimit: <?= $simultaneous_upload_limit ?>,
-      wmode: "transparent",
-      hideButton: true, /* should be true */
-      auto: true,
-      multi: true,
-      onAllComplete: function(filesUploaded, errors, allbytesLoaded, speed) {
-        $("#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) {
-        var re = /^error: (.*)$/i;
-        var msg = re.exec(response);
-        if (msg) {
-          $("#g-add-photos-status ul").append(
-            "<li class=\"g-error\">" + fileObj.name + " - " + msg[1] + "</li>");
-        } else {
-          $("#g-add-photos-status ul").append(
-            "<li class=\"g-success\">" + fileObj.name + " - " + <?= t("Completed")->for_js() ?> + "</li>");
-        }
-        return true;
-      },
-      onError: function(event, queueID, fileObj, errorObj) {
-        var msg = " - ";
-        if (errorObj.type == "HTTP") {
-          if (errorObj.info == "500") {
-            msg += <?= t("Unable to process this file")->for_js() ?>;
-            // Server error - check server logs
-          } else if (errorObj.info == "404") {
-            msg += <?= t("The upload script was not found.")->for_js() ?>;
-            // Server script not found
-          } else {
-            // Server Error: status: errorObj.info
-            msg += (<?= t("Server error: __INFO__")->for_js() ?>.replace("__INFO__", errorObj.info));
-          }
-        } else if (errorObj.type == "File Size") {
-          var sizelimit = $("#g-uploadify").uploadifySettings(sizeLimit);
-          msg += fileObj.name+' '+errorObj.type+' Limit: '+Math.round(d.sizeLimit/1024)+'KB';
-        } else {
-          msg += (<?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
-            .replace("__INFO__", errorObj.info)
-            .replace("__TYPE__", errorObj.type));
-        }
-        $("#g-add-photos-status ul").append(
-          "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
-        $("#g-uploadify" + queueID).remove();
-      },
-      onSelect: function(event) {
-        if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {
+    if (swfobject.hasFlashPlayerVersion("<?= $flash_minimum_version ?>")) {
+      $("#g-uploadify").uploadify({
+        width: 150,
+        height: 33,
+        uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
+        script: "<?= url::site("uploader/add_photo/{$album->id}") ?>",
+        scriptData: <?= json_encode($script_data) ?>,
+        fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.GIF;*.JPG;*.JPEG;*.PNG<? if ($movies_allowed): ?>;*.flv;*.mp4;*.m4v;*.FLV;*.MP4;*.M4V<? endif ?>",
+        fileDesc: <?= t("Photos and movies")->for_js() ?>,
+        cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
+        simUploadLimit: <?= $simultaneous_upload_limit ?>,
+        wmode: "transparent",
+        hideButton: true, /* should be true */
+        auto: true,
+        multi: true,
+        onAllComplete: function(filesUploaded, errors, allbytesLoaded, speed) {
           $("#g-upload-cancel-all")
+            .addClass("ui-state-disabled")
+            .attr("disabled", "disabled");
+          $("#g-upload-done")
             .removeClass("ui-state-disabled")
             .attr("disabled", null);
-          $("#g-upload-done")
+          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) {
+          var re = /^error: (.*)$/i;
+          var msg = re.exec(response);
+          if (msg) {
+            $("#g-add-photos-status ul").append(
+              "<li class=\"g-error\">" + fileObj.name + " - " + msg[1] + "</li>");
+          } else {
+            $("#g-add-photos-status ul").append(
+              "<li class=\"g-success\">" + fileObj.name + " - " + <?= t("Completed")->for_js() ?> + "</li>");
+          }
+          return true;
+        },
+        onError: function(event, queueID, fileObj, errorObj) {
+          var msg = " - ";
+          if (errorObj.type == "HTTP") {
+            if (errorObj.info == "500") {
+              msg += <?= t("Unable to process this file")->for_js() ?>;
+              // Server error - check server logs
+            } else if (errorObj.info == "404") {
+              msg += <?= t("The upload script was not found.")->for_js() ?>;
+              // Server script not found
+            } else {
+              // Server Error: status: errorObj.info
+              msg += (<?= t("Server error: __INFO__")->for_js() ?>.replace("__INFO__", errorObj.info));
+            }
+          } else if (errorObj.type == "File Size") {
+            var sizelimit = $("#g-uploadify").uploadifySettings(sizeLimit);
+            msg += fileObj.name+' '+errorObj.type+' Limit: '+Math.round(d.sizeLimit/1024)+'KB';
+          } else {
+            msg += (<?= t("Server error: __INFO__ (__TYPE__)")->for_js() ?>
+              .replace("__INFO__", errorObj.info)
+              .replace("__TYPE__", errorObj.type));
+          }
+          $("#g-add-photos-status ul").append(
+            "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
+          $("#g-uploadify" + queueID).remove();
+        },
+        onSelect: function(event) {
+          if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {
+            $("#g-upload-cancel-all")
+              .removeClass("ui-state-disabled")
+              .attr("disabled", null);
+            $("#g-upload-done")
+              .addClass("ui-state-disabled")
+              .attr("disabled", "disabled");
+          }
+          return true;
         }
-        return true;
-      }
-    });
+      });
+    } else {
+      $(".requires-flash").hide();
+      $(".no-flash").show();
+    }
   });
 </script>
 
-<? if ($suhosin_session_encrypt || !$movies_allowed): ?>
-<div class="g-message-block g-info">
-  <? if ($suhosin_session_encrypt): ?>
-  <p class="g-error">
-    <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>.  You must disable this setting to upload photos.",
-        array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
-    "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?>
-  </p>
-  <? endif ?>
+<div class="requires-flash">
+  <? if ($suhosin_session_encrypt || !$movies_allowed): ?>
+  <div class="g-message-block g-info">
+    <? if ($suhosin_session_encrypt): ?>
+    <p class="g-error">
+      <?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>.  You must disable this setting to upload photos.",
+          array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
+      "suhosin_url" => "http://www.hardened-php.net/suhosin/")) ?>
+    </p>
+    <? endif ?>
 
-  <? if (!$movies_allowed): ?>
-  <p class="g-warning">
-    <?= t("Can't find <i>ffmpeg</i> on your system. Movie uploading disabled. <a href=\"%help_url\">Help!</a>", array("help_url" => "http://codex.gallery2.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?>
-  </p>
+    <? if (!$movies_allowed): ?>
+    <p class="g-warning">
+      <?= t("Can't find <i>ffmpeg</i> on your system. Movie uploading disabled. <a href=\"%help_url\">Help!</a>", array("help_url" => "http://codex.gallery2.org/Gallery3:FAQ#Why_does_it_say_I.27m_missing_ffmpeg.3F")) ?>
+    </p>
+    <? endif ?>
+  </div>
   <? endif ?>
+
+  <div>
+    <p>
+      <?= t("Photos will be uploaded to album: ") ?>
+    </p>
+    <ul class="g-breadcrumbs ui-helper-clearfix">
+      <? foreach ($album->parents() as $i => $parent): ?>
+      <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
+      <? endforeach ?>
+      <li class="g-active"> <?= html::purify($album->title) ?> </li>
+    </ul>
+  </div>
+
+  <div id="g-add-photos-canvas">
+    <button id="g-add-photos-button" class="g-button ui-state-default ui-corner-all" href="#"><?= t("Select photos...") ?></button>
+    <span id="g-uploadify"></span>
+  </div>
+  <div id="g-add-photos-status">
+    <ul id="g-action-status" class="g-message-block">
+    </ul>
+  </div>
 </div>
-<? endif ?>
 
-<div>
+<div class="no-flash" style="display: none">
   <p>
-    <?= t("Photos will be uploaded to album: ") ?>
+    <?= t("Your browser must have Adobe Flash Player version %flash_minimum_version or greater installed to use this feature.", array("flash_minimum_version" => $flash_minimum_version)) ?>
   </p>
-  <ul class="g-breadcrumbs ui-helper-clearfix">
-    <? foreach ($album->parents() as $i => $parent): ?>
-    <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
-    <? endforeach ?>
-    <li class="g-active"> <?= html::purify($album->title) ?> </li>
-  </ul>
-</div>
-
-<div id="g-add-photos-canvas">
-  <button id="g-add-photos-button" class="g-button ui-state-default ui-corner-all" href="#"><?= t("Select photos...") ?></button>
-  <span id="g-uploadify"></span>
-</div>
-<div id="g-add-photos-status">
-  <ul id="g-action-status" class="g-message-block">
-  </ul>
+  <a href="http://www.adobe.com/go/getflashplayer">
+    <img src="<?= request::protocol() ?>://www.adobe.com/images/shared/download_buttons/get_flash_player.gif"
+         alt=<?= t("Get Adobe Flash Player")->for_js() ?> />
+  </a>
 </div>
diff --git a/modules/gallery/views/form_uploadify_buttons.html.php b/modules/gallery/views/form_uploadify_buttons.html.php
index 98729bd7..ce4d989c 100644
--- a/modules/gallery/views/form_uploadify_buttons.html.php
+++ b/modules/gallery/views/form_uploadify_buttons.html.php
@@ -1,8 +1,10 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<!-- Proxy the done request back to our form, since its been ajaxified -->
-<button id="g-upload-done" class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit();return false;">
+<div class="requires-flash">
+  <!-- Proxy the done request back to our form, since its been ajaxified -->
+  <button id="g-upload-done" class="ui-state-default ui-corner-all" onclick="$('#g-add-photos-form').submit();return false;">
   <?= 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">
+  </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 uploads") ?>
-</button>
+  </button>
+</div>
-- 
cgit v1.2.3


From db769b76ab7b7ed54579225fca836defc7afbd11 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 31 Aug 2010 00:03:46 -0700
Subject: Expire completed uploads and introduce a text message that says how
 many photos have been uploaded successfully.  This is to pave the way for
 retry code later on.

---
 modules/gallery/controllers/uploader.php           |  8 ++++++
 modules/gallery/css/gallery.css                    |  4 +++
 modules/gallery/views/form_uploadify.html.php      | 32 +++++++++++++++++-----
 .../gallery/views/form_uploadify_buttons.html.php  |  1 +
 4 files changed, 38 insertions(+), 7 deletions(-)

(limited to 'modules/gallery/views/form_uploadify_buttons.html.php')

diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 85d344d6..fb496f60 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -102,6 +102,14 @@ class Uploader_Controller extends Controller {
     }
   }
 
+  public function status($success_count, $error_count) {
+    // The "errors" won't be properly pluralized :-/
+    print t2("Uploaded %count photo (%error errors)",
+             "Uploaded %count photos (%error errors)",
+             $success_count,
+             array("error" => $error_count));
+  }
+
   public function finish() {
     access::verify_csrf();
 
diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index fb72bd48..8012c6cc 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -78,6 +78,10 @@
   margin-bottom: 0
 }
 
+#g-add-photos-status-message {
+  float: right;
+}
+
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-edit-permissions-form {
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 2ed7912f..36f5f284 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -3,7 +3,24 @@
 <script type="text/javascript" src="<?= url::file("lib/uploadify/jquery.uploadify.min.js") ?>"></script>
 <script type="text/javascript">
   <? $flash_minimum_version = "9.0.24" ?>
+  var success_count = 0;
+  var error_count = 0;
+  var updating = 0;
   $("#g-add-photos-canvas").ready(function () {
+    var update_status = function() {
+      if (updating) {
+        // poor man's mutex
+        setTimeout(function() { update_status(); }, 500);
+      }
+      updating = 1;
+      $.get("<?= url::site("uploader/status/_S/_E") ?>"
+            .replace("_S", success_count).replace("_E", error_count),
+          function(data) {
+            $("#g-add-photos-status-message").html(data);
+            updating = 0;
+          });
+    };
+
     if (swfobject.hasFlashPlayerVersion("<?= $flash_minimum_version ?>")) {
       $("#g-uploadify").uploadify({
         width: 150,
@@ -40,13 +57,12 @@
         onComplete: function(event, queueID, fileObj, response, data) {
           var re = /^error: (.*)$/i;
           var msg = re.exec(response);
-          if (msg) {
-            $("#g-add-photos-status ul").append(
-              "<li class=\"g-error\">" + fileObj.name + " - " + msg[1] + "</li>");
-          } else {
-            $("#g-add-photos-status ul").append(
-              "<li class=\"g-success\">" + fileObj.name + " - " + <?= t("Completed")->for_js() ?> + "</li>");
-          }
+          $("#g-add-photos-status ul").append(
+            "<li id=\"q" + queueID + "\" class=\"g-success\">" + fileObj.name + " - " +
+            <?= t("Completed")->for_js() ?> + "</li>");
+          setTimeout(function() { $("#q" + queueID).slideUp("slow") }, 5000);
+          success_count++;
+          update_status();
           return true;
         },
         onError: function(event, queueID, fileObj, errorObj) {
@@ -73,6 +89,8 @@
           $("#g-add-photos-status ul").append(
             "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
           $("#g-uploadify" + queueID).remove();
+          error_count++;
+          update_status();
         },
         onSelect: function(event) {
           if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {
diff --git a/modules/gallery/views/form_uploadify_buttons.html.php b/modules/gallery/views/form_uploadify_buttons.html.php
index ce4d989c..e002d82d 100644
--- a/modules/gallery/views/form_uploadify_buttons.html.php
+++ b/modules/gallery/views/form_uploadify_buttons.html.php
@@ -7,4 +7,5 @@
   <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 uploads") ?>
   </button>
+  <span id="g-add-photos-status-message" />
 </div>
-- 
cgit v1.2.3