Revert "Refactor the admin maintenance screen so that events are used to

populate the action buttons and other content such as the list of scheduled
tasks."

Leaving this api out of RC1.

This reverts commit 19fee6b5e4ceb8a5f90cafe4ad770856ece108ef.

Conflicts:

	modules/gallery/views/admin_maintenance.html.php

2 files changed, 11 insertions, 16 deletions

diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 8e4845a9..487e77a6 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -44,17 +44,10 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     $view->content->task_definitions = task::get_definitions();
     $view->content->running_tasks = ORM::factory("task")
       ->where("done", "=", 0)->order_by("updated", "DESC")->find_all();
+    $view->content->schedule_definitions =
+      module::is_active("scheduler") ? scheduler::get_definitions() : "";
     $view->content->finished_tasks = ORM::factory("task")
       ->where("done", "=", 1)->order_by("updated", "DESC")->find_all();
-    $task_buttons =
-      new ArrayObject(array((object)array("text" => t("run"),
-                                          "url" =>url::site("admin/maintenance/start"))));
-    module::event("admin_maintenance_task_buttons", $task_buttons);
-    $view->content->task_buttons = $task_buttons;
-
-    $maintenance_content = new ArrayObject();
-    module::event("admin_maintenance_content", $maintenance_content);
-    $view->content->task_maintenance_content = $maintenance_content;
     print $view;
   }
 
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 19375670..15d04caa 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -29,21 +29,23 @@
             <?= $task->description ?>
           </td>
           <td>
-            <? foreach ($task_buttons as $button): ?>
-            <a href="<?= "{$button->url}/$task->callback?csrf=$csrf" ?>"
+            <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
               class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
-              <?= html::clean($button->text) ?>
+              <?= t("run") ?>
             </a>
-            <? endforeach ?>
+            <? if (module::is_active("scheduler")): ?>
+            <a href="<?= url::site("form/add/admin/schedule/$task->callback?csrf=$csrf") ?>"
+              class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
+              <?= t("schedule") ?>
+            </a>
+            <? endif ?>
           </td>
         </tr>
         <? endforeach ?>
       </table>
     </div>
 
-    <? foreach ($task_maintenance_content as $content): ?>
-    <?= html::purify($content) ?>
-    <? endforeach ?>
+    <?= $schedule_definitions ?>
 
     <? if ($running_tasks->count()): ?>
     <div id="g-running-tasks">