diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-08-31 00:32:41 -0700 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-08-31 00:32:41 -0700 |
| commit | 6d26b0dd6e900250072ca723c388cf3c5d987aeb (patch) | |
| tree | 392f46f356e44c4900954e346c3b56a18be95dc6 /modules/gallery | |
| parent | 2bf9b8ee550a805605f862c392839e49ae42f89d (diff) | |
| parent | 12e00309cedb3ed4349ab70a38d64e2b439c5f20 (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/views/admin_maintenance.html.php | 20 | ||||
| -rw-r--r-- | modules/gallery/views/admin_maintenance_task.html.php | 1 |
2 files changed, 10 insertions, 11 deletions
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index 05bc0923..4bca8653 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -22,7 +22,7 @@ <? $i = 0; ?> <? foreach ($task_definitions as $task): ?> <tr class="<?= log::severity_class($task->severity) ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>"> - <td> + <td class="<?= log::severity_class($task->severity) ?>"> <?= $task->name ?> </td> <td> @@ -42,10 +42,6 @@ <? if ($running_tasks->count()): ?> <div id="gRunningTasks"> - <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>" - class="gButtonLink ui-icon-left ui-state-default ui-corner-all right"> - <?= t("cancel all") ?></a> - <h2> <?= t("Running Tasks") ?> </h2> <table> <tr> @@ -66,12 +62,15 @@ </th> <th> <?= t("Action") ?> + <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>" + class="gButtonLink ui-icon-left ui-state-default ui-corner-all right"> + <?= t("cancel all") ?></a> </th> </tr> <? $i = 0; ?> <? foreach ($running_tasks as $task): ?> <tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>"> - <td> + <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>"> <?= gallery::date_time($task->updated) ?> </td> <td> @@ -116,10 +115,6 @@ <? if ($finished_tasks->count()): ?> <div id="gFinishedTasks"> - <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>" - class="gButtonLink ui-icon-left ui-state-default ui-corner-all right"> - <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a> - <h2> <?= t("Finished Tasks") ?> </h2> <table> <tr> @@ -140,12 +135,15 @@ </th> <th> <?= t("Action") ?> + <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>" + class="gButtonLink ui-icon-left ui-state-default ui-corner-all right"> + <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a> </th> </tr> <? $i = 0; ?> <? foreach ($finished_tasks as $task): ?> <tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>"> - <td> + <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>"> <?= gallery::date_time($task->updated) ?> </td> <td> 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() { |