diff options
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/admin_maintenance.html.php | 20 | ||||
| -rw-r--r-- | modules/gallery/views/admin_maintenance_show_log.html.php | 19 | ||||
| -rw-r--r-- | modules/gallery/views/kohana_error_page.php | 10 | ||||
| -rw-r--r-- | modules/gallery/views/upgrader.html.php | 2 |
4 files changed, 41 insertions, 10 deletions
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index c47f77f8..cd1cc02e 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -29,7 +29,7 @@ </td> <td> <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>" - class="gDialogLink"> + class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"> <?= t("run") ?> </a> </td> @@ -94,11 +94,13 @@ </td> <td> <? if ($task->state == "stalled"): ?> - <a class="gDialogLink" href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>"> + <a class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all" + href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>"> <?= t("resume") ?> </a> <? endif ?> - <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"> + <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" + class="gButtonLink ui-icon-left ui-state-default ui-corner-all right"> <?= t("cancel") ?> </a> </td> @@ -161,17 +163,23 @@ </td> <td> <? if ($task->done): ?> - <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>"> + <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all"> <?= t("remove") ?> </a> + <? if ($task->get_log()): ?> + <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="gDialogLink gButtonLink ui-state-default ui-corner-all"> + <?= t("browse log") ?> + </a> + <? endif ?> <? else: ?> - <a class="gDialogLink" href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>"> + <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="gDialogLink gButtonLink" ui-state-default ui-corner-all> <?= t("resume") ?> </a> - <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"> + <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all"> <?= t("cancel") ?> </a> <? endif ?> + </ul> </td> </tr> <? endforeach ?> diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php new file mode 100644 index 00000000..9d850986 --- /dev/null +++ b/modules/gallery/views/admin_maintenance_show_log.html.php @@ -0,0 +1,19 @@ +<?php defined("SYSPATH") or die("No direct script access.") ?> +<script type="text/javascript"> + dismiss = function() { + window.location.reload(); + } + download = function(){ + // send request + $('<form action="<?= url::site("admin/maintenance/save_log/$task->id?csrf=$csrf") ?>" method="post"></form>'). +appendTo('body').submit().remove(); + }; +</script> +<div id="gTaskLogDialog"> + <h1> <?= $task->name ?> </h1> + <div class="gTaskLog"> + <pre><?= p::purify($task->get_log()) ?></pre> + </div> + <button id="gCloseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button> + <button id="gSaveButton" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button> +</div> diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php index 6bf48549..9361514d 100644 --- a/modules/gallery/views/kohana_error_page.php +++ b/modules/gallery/views/kohana_error_page.php @@ -53,7 +53,6 @@ margin: 0px; } </style> - <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <title><?= t("Something went wrong!") ?></title> </head> @@ -78,8 +77,13 @@ <h2> <?= t("Hey wait, you're an admin! We can tell you stuff.") ?> </h2> - <a id="toggle" href="" - onclick="javascript:$('#stuff').slideDown('slow'); $('#toggle').slideUp(); return false"> + <script type="text/javascript"> + var show_details = function() { + document.getElementById("stuff").style.display = "block"; + document.getElementById("toggle").style.display = "none"; + } + </script> + <a id="toggle" href="#" onclick="javascript:show_details(); return false;"> <b><?= t("Ok.. tell me stuff!") ?></b> </a> <div id="stuff" style="display: none"> diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php index f9e242a8..37578855 100644 --- a/modules/gallery/views/upgrader.html.php +++ b/modules/gallery/views/upgrader.html.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <html> <head> - <title><?= t("Gallery3 Upgrader") ?></title> + <title><?= t("Gallery 3 Upgrader") ?></title> <link rel="stylesheet" type="text/css" href="<?= url::file("modules/gallery/css/upgrader.css") ?>" media="screen,print,projection" /> <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script> |
