diff options
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/admin_maintenance_task.html.php | 15 | ||||
| -rw-r--r-- | modules/gallery/views/form.html.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/item_edit.html.php | 9 |
3 files changed, 13 insertions, 13 deletions
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php index c81fe571..0eb0b38c 100644 --- a/modules/gallery/views/admin_maintenance_task.html.php +++ b/modules/gallery/views/admin_maintenance_task.html.php @@ -5,11 +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; - } $(".gProgressBar").progressbar("value", new_value); animation = setTimeout(function() { animate_progress_bar(target_value); }, 100); } else { diff --git a/modules/gallery/views/form.html.php b/modules/gallery/views/form.html.php index ec2a56a9..730d77cb 100644 --- a/modules/gallery/views/form.html.php +++ b/modules/gallery/views/form.html.php @@ -40,6 +40,8 @@ if (!function_exists("DrawForm")) { print "$prefix {$hidden->render()}\n"; } print "$prefix</fieldset>\n"; + } else if ($input->type == 'script') { + print $input->render(); } else { if ($input->error_messages()) { print "$prefix<li class=\"gError\">\n"; diff --git a/modules/gallery/views/item_edit.html.php b/modules/gallery/views/item_edit.html.php deleted file mode 100644 index 9aa2fb64..00000000 --- a/modules/gallery/views/item_edit.html.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php defined("SYSPATH") or die("No direct script access.") ?> -<? if (!empty($script)): ?> -<script> - <?= implode("\n", $script) ?> -</script> -<? endif ?> -<div id="gEditFormContainer"> - <?= $form ?> -</div>
\ No newline at end of file |
