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


From a5ddef021c1ca4920e40c0657de082ae0d7008ee Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 29 Aug 2009 15:03:46 -0700
Subject: Fix invalida syntax on trying to parse the progress bar percentage

---
 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 0eb0b38c..509e87b5 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -4,7 +4,7 @@
   var animation = null;
   var delta = 1;
   animate_progress_bar = function() {
-    var current_value = Number($(".gProgressBar div").css("width").replace("%", ""));
+    var current_value = parseInt($(".gProgressBar div").css("width").replace("%", ""));
     if (target_value > current_value) {
       // speed up
       delta = Math.min(delta + 0.04, 3);
-- 
cgit v1.2.3


From 93b542ccd8a64bdd037d0e4824be06cb9fe6ad49 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 30 Aug 2009 22:32:23 -0600
Subject: Apply hover effect to buttons in progress indicator dialog.

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

(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 509e87b5..0f33d508 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -23,6 +23,7 @@
       animation = null;
       delta = 1;
     }
+    $.fn.gallery_hover_init();
   }
 
   update = function() {
-- 
cgit v1.2.3


From 39ca803af7a4439fdda3164d79d9435bdaa2b948 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Mon, 31 Aug 2009 23:51:27 -0600
Subject: Set CSS cursor to hand for jQuery UI ui-state-hover elements. Fixes
 all but progress bar cursor. #669

---
 modules/gallery/views/admin_maintenance_task.html.php | 2 +-
 themes/admin_default/css/admin_screen.css             | 7 -------
 themes/admin_default/css/screen.css                   | 9 ++++++++-
 themes/default/css/screen.css                         | 8 ++++++--
 4 files changed, 15 insertions(+), 11 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 0f33d508..bfc6ef44 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -57,7 +57,7 @@
   <div id="gStatus">
     <?= t("Starting up...") ?>
   </div>
-  <div>
+  <div class="txtright">
     <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("Close") ?></button>
   </div>
diff --git a/themes/admin_default/css/admin_screen.css b/themes/admin_default/css/admin_screen.css
index fd1ed02e..a8c16ae5 100644
--- a/themes/admin_default/css/admin_screen.css
+++ b/themes/admin_default/css/admin_screen.css
@@ -391,13 +391,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 .rtl #gRenameTagForm a, #gRenameTagForm span {
   float: right;
 }
-#gProgress button {
-  float: right;
-  margin-top: 1em;
-}
-.rtl #gProgress button {
-  float: left;
-}
 
 #gTaskLogDialog h1 {
   font-size: 1.1em;
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 21b2b31c..eb8f9224 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -71,7 +71,10 @@ a,
 #gDialog a,
 .gButtonLink,
 .gButtonLink:hover,
-.gButtonLink:active {
+.gButtonLink:active,
+a.ui-state-hover,
+input.ui-state-hover,
+button.ui-state-hover {
   color: #5382BF !important;
   text-decoration: none;
   -moz-outline-style: none;
@@ -1055,6 +1058,10 @@ table .gSuccess {
   text-align: right;
 }
 
+.rtl .txtright {
+  text-align: left;
+}
+
 .rtl #gHeader #gQuickSearchForm,
 .rtl #gForgotPasswordLink,
 .rtl #gHeader #gLoginMenu,
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index f6ce26d2..96be8996 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -71,8 +71,12 @@ a,
 #gDialog a,
 .gButtonLink,
 .gButtonLink:hover,
-.gButtonLink:active {
-  color: #5382BF !important;
+.gButtonLink:active,
+a.ui-state-hover,
+input.ui-state-hover,
+button.ui-state-hover {
+  color: #5382bf !important;
+  cursor: pointer !important;
   text-decoration: none;
   -moz-outline-style: none;
 }
-- 
cgit v1.2.3


From 53711225ac9d116e72c159de943284fd55fe26e4 Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 1 Sep 2009 01:28:52 -0700
Subject: XSS / style fixes for newly detected issues (after fixing XSS
 scanner)

---
 modules/comment/views/admin_comments.html.php         | 6 +++---
 modules/gallery/views/admin_dashboard.html.php        | 2 +-
 modules/gallery/views/admin_graphics.html.php         | 2 +-
 modules/gallery/views/admin_maintenance_task.html.php | 2 +-
 modules/recaptcha/views/admin_recaptcha.html.php      | 4 ++--
 modules/recaptcha/views/form_recaptcha.html.php       | 2 +-
 modules/user/views/login_ajax.html.php                | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index f5970ae1..455cd714 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   var set_state_url =
-    "<?= url::site("admin/comments/set_state/__ID__/__STATE__?csrf=$csrf") ?>";
+    <?= html::js_string(url::site("admin/comments/set_state/__ID__/__STATE__?csrf=$csrf")) ?>;
   function set_state(state, id) {
     $.get(set_state_url.replace("__STATE__", state).replace("__ID__", id),
           {},
@@ -12,7 +12,7 @@
   }
 
   var delete_url =
-    "<?= url::site("admin/comments/delete/__ID__?csrf=$csrf") ?>";
+    <?= html::js_string(url::site("admin/comments/delete/__ID__?csrf=$csrf")) ?>;
 
   function del(id) {
     $.get(delete_url.replace("__ID__", id),
@@ -24,7 +24,7 @@
   }
 
   function update_menu() {
-    $.get("<?= url::site("admin/comments/menu_labels") ?>", {},
+    $.get(<?= html::js_string(url::site("admin/comments/menu_labels")) ?>, {},
           function(data) {
             for (var i = 0; i < data.length; i++) {
               $("#gAdminCommentsMenu li:eq(" + i + ") a").html(data[i]);
diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
index a2d22ab6..148de65f 100644
--- a/modules/gallery/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   update_blocks = function() {
-    $.get("<?= url::site("admin/dashboard/reorder") ?>",
+    $.get(<?= html::js_string(url::site("admin/dashboard/reorder")) ?>,
           {"csrf": "<?= $csrf ?>",
            "dashboard_center[]": $("#gAdminDashboard").sortable(
              "toArray", {attribute: "block_id"}),
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index c4a2f5c6..f64c7f80 100644
--- a/modules/gallery/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
@@ -3,7 +3,7 @@
   $(document).ready(function() {
     select_toolkit = function(el) {
       if (!$(this).hasClass("gUnavailable")) {
-        window.location = '<?= url::site("admin/graphics/choose/__TK__?csrf=$csrf") ?>'
+        window.location = <?= html::js_string(url::site("admin/graphics/choose/__TK__?csrf=$csrf")) ?>
           .replace("__TK__", $(this).attr("id"));
       }
     };
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 0f33d508..fc0e0af5 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -28,7 +28,7 @@
 
   update = function() {
     $.ajax({
-      url: "<?= url::site("admin/maintenance/run/$task->id?csrf=$csrf") ?>",
+      url: <?= html::js_string(url::site("admin/maintenance/run/$task->id?csrf=$csrf")) ?>,
       dataType: "json",
       success: function(data) {
         target_value = data.task.percent_complete;
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index 43b4da8a..35722be4 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -4,7 +4,7 @@
   <p>
     <?= t("reCAPTCHA is a free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.  In order to use it, you need to sign up for a <a href=\"%domain_url\">reCAPTCHA Public/Private Key pair</a>, which is also free.  Once registered, the challenge and response strings are evaluated at <a href=\"%recaptcha_url\">recaptcha.net</a> to determine if the form content has been entered by a bot.",
           array("domain_url" => $form->get_key_url,
-                "recaptcha_url" => "http://recaptcha.net")) ?>
+                "recaptcha_url" => html::mark_safe("http://recaptcha.net"))) ?>
   </p>
 
      <?= $form ?>
@@ -23,7 +23,7 @@
     Recaptcha.create("<?= $public_key ?>", "gRecaptcha", {
       callback: Recaptcha.focus_response_field,
       lang: "en",
-      custom_translations : { instructions_visual : "<?= t("Type words to check:") ?>"},
+      custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>},
       theme: "white"
     });
   </script>
diff --git a/modules/recaptcha/views/form_recaptcha.html.php b/modules/recaptcha/views/form_recaptcha.html.php
index d4031586..4ec04c49 100644
--- a/modules/recaptcha/views/form_recaptcha.html.php
+++ b/modules/recaptcha/views/form_recaptcha.html.php
@@ -8,7 +8,7 @@
       "gRecaptcha",
       {
         theme: "white",
-        custom_translations : { instructions_visual : "<?= t("Type words to check:") ?>"},
+        custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>},
         callback: Recaptcha.focus_response_field
       }
     );
diff --git a/modules/user/views/login_ajax.html.php b/modules/user/views/login_ajax.html.php
index d697c958..56bc1cbd 100644
--- a/modules/user/views/login_ajax.html.php
+++ b/modules/user/views/login_ajax.html.php
@@ -6,7 +6,7 @@
         url: "<?= url::site("password/reset") ?>",
         success: function(data) {
           $("div#gLoginView").html(data);
-          $("#ui-dialog-title-gDialog").text("<?= t("Reset Password") ?>");
+          $("#ui-dialog-title-gDialog").html(<?= t("Reset Password")->for_js() ?>);
           ajaxify_login_reset_form();
         }
       });
-- 
cgit v1.2.3