diff options
| -rw-r--r-- | modules/gallery/views/admin_maintenance.html.php | 20 | ||||
| -rw-r--r-- | themes/admin_default/css/screen.css | 7 | ||||
| -rw-r--r-- | themes/default/css/screen.css | 1 |
3 files changed, 10 insertions, 18 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/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index c275eb10..21b2b31c 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -312,7 +312,6 @@ li.gError select { .gError { background-color: #f6cbca; - color: red; background-image: url('../images/ico-error.png'); } @@ -346,11 +345,7 @@ table .gSuccess { background-color: transparent !important; } -.gPager .gInfo, -table .gError, -table .gInfo, -table .gSuccess, -table .gWarning { +.gPager .gInfo { background-image: none !important; } diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 5eb30bde..7cf4cfbe 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -308,7 +308,6 @@ li.gError select { .gError { background-color: #f6cbca; - color: #f00; background-image: url('../images/ico-error.png'); } |