Merge branch 'master' of git@github.com:/gallery/gallery3

This commit is contained in:
Bharat Mediratta
2009-08-30 17:41:52 -07:00
3 changed files with 10 additions and 18 deletions

View File

@@ -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>

View File

@@ -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;
}

View File

@@ -308,7 +308,6 @@ li.gError select {
.gError {
background-color: #f6cbca;
color: #f00;
background-image: url('../images/ico-error.png');
}