summaryrefslogtreecommitdiff
path: root/modules/gallery/views
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@gmail.com>2009-08-29 17:34:39 -0600
committerChad Kieffer <ckieffer@gmail.com>2009-08-29 17:34:39 -0600
commitc9d2e222662746c1a8d1866dcd480f1440898735 (patch)
tree938b7b88efbf55c9228932a9cf6afcc8c38a1c90 /modules/gallery/views
parent75ee962c9e1b6a0c24928f80245430db71780a3d (diff)
parenta1ce2d3f0aff6dcb7149f2d7327a10079e5c78f8 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/views')
-rw-r--r--modules/gallery/views/admin_maintenance_task.html.php2
-rw-r--r--modules/gallery/views/l10n_client.html.php5
2 files changed, 5 insertions, 2 deletions
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);
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 5ee7eca3..6c440b68 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -3,7 +3,8 @@
<div class="labels">
<span id="l10n-client-toggler">
<a id="gMinimizeL10n">_</a>
- <a id="gCloseL10n" href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>">X</a>
+ <a id="gCloseL10n" title="<?= t("Stop the translation mode") ?>"
+ href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>">X</a>
</span>
<div class="label strings"><h2><?= t("Page Text") ?>
<? if (!Input::instance()->get('show_all_l10n_messages')): ?>
@@ -76,5 +77,7 @@
var MSG_CLOSE_X = "<?= t("X") ?>";
var l10n_client_data = <?= json_encode($string_list) ?>;
var plural_forms = <?= json_encode($plural_forms) ?>;
+ var toggle_l10n_mode_url = "<?= url::site("l10n_client/toggle_l10n_mode") ?>";
+ var csrf = "<?= access::csrf_token() ?>";
</script>
</div>