From 15bb52a7767d141ff10179f36ea8389f461df801 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 10 Jul 2009 14:12:13 -0700
Subject: Change the word "Done" to "Close" to make translations easier

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

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

diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index d9aecc60..5c2c03a1 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -30,6 +30,6 @@
   </div>
   <div>
     <button id="gPauseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
-    <button id="gDoneButton" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Done") ?></button>
+    <button id="gDoneButton" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button>
   </div>
 </div>
-- 
cgit v1.2.3


From 5c8a2a750ccc16b5e8b0dd97ff21dbfb9860d856 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 23 Jul 2009 20:43:32 -0700
Subject: Smooth out the animaation for the progress bar.

---
 .../gallery/views/admin_maintenance_task.html.php  | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

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

diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 5c2c03a1..c81fe571 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -1,11 +1,32 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
+  var target_value;
+  var animation = null;
+  var delta = 1;
+  animate_progress_bar = function() {
+    var current_value = Number($(".gProgressBar div").css("width").replace("%", ""));
+    if (current_value != target_value) {
+      var new_value = Math.min(current_value + delta, target_value);
+      if (target_value - current_value > delta) {
+        delta += .075;
+      }
+      $(".gProgressBar").progressbar("value", new_value);
+      animation = setTimeout(function() { animate_progress_bar(target_value); }, 100);
+    } else {
+      animation = null;
+      delta = 1;
+    }
+  }
+
   update = function() {
     $.ajax({
       url: "<?= url::site("admin/maintenance/run/$task->id?csrf=$csrf") ?>",
       dataType: "json",
       success: function(data) {
-        $(".gProgressBar").progressbar("value", data.task.percent_complete);
+        target_value = data.task.percent_complete;
+        if (!animation) {
+          animate_progress_bar();
+        }
         $("#gStatus").html("" + data.task.status);
         if (data.task.done) {
           $("#gPauseButton").hide();
-- 
cgit v1.2.3


From eda2d75fa0fc1fa3f4c8b5f1dcbdc446419f7bd5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 28 Jul 2009 20:31:24 -0700
Subject: Disable smooth progressbar scrolling when we're at 100% (else the
 progressbar trucks along slowly even though the task is done).

---
 modules/gallery/views/admin_maintenance_task.html.php | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index c81fe571..4755fe73 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -10,6 +10,9 @@
       if (target_value - current_value > delta) {
         delta += .075;
       }
+      if (target_value == 100) {
+        new_value = 100;
+      }
       $(".gProgressBar").progressbar("value", new_value);
       animation = setTimeout(function() { animate_progress_bar(target_value); }, 100);
     } else {
-- 
cgit v1.2.3


From e6d6e498c0acbe1e97b07c0c5a357a84b65f06f9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 28 Jul 2009 21:21:09 -0700
Subject: Adjust the velocity based on whether or not we're waiting for more
 updates to get smoother scrolling.

---
 modules/gallery/views/admin_maintenance_task.html.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

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

diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 4755fe73..0eb0b38c 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -5,14 +5,18 @@
   var delta = 1;
   animate_progress_bar = function() {
     var current_value = Number($(".gProgressBar div").css("width").replace("%", ""));
-    if (current_value != target_value) {
+    if (target_value > current_value) {
+      // speed up
+      delta = Math.min(delta + 0.04, 3);
+    } else {
+      // slow down
+      delta = Math.max(delta - 0.05, 1);
+    }
+
+    if (target_value == 100) {
+      $(".gProgressBar").progressbar("value", 100);
+    } else if (current_value != target_value || delta != 1) {
       var new_value = Math.min(current_value + delta, target_value);
-      if (target_value - current_value > delta) {
-        delta += .075;
-      }
-      if (target_value == 100) {
-        new_value = 100;
-      }
       $(".gProgressBar").progressbar("value", new_value);
       animation = setTimeout(function() { animate_progress_bar(target_value); }, 100);
     } else {
-- 
cgit v1.2.3