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

3 files changed, 64 insertions, 6 deletions

diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index a9d64637..ae05fb5d 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -42,4 +42,22 @@ class organize_event_Core {
     }
   }
 
+  static function pre_deactivate($data) {
+    if ($data->module == "rest") {
+      $data->messages["warn"][] = t("The Organize module requires the Rest module.");
+    }
+  }
+
+  static function module_change($changes) {
+    if (!module::is_active("rest") || in_array("rest", $changes->deactivate)) {
+      site_status::warning(
+        t("The Organize module requires the Rest module.  " .
+          "<a href=\"%url\">Activate the Rest module now</a>",
+          array("url" => html::mark_clean(url::site("admin/modules")))),
+        "organize_needs_rest");
+    } else {
+      site_status::clear("organize_needs_rest");
+    }
+  }
+
 }
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
new file mode 100644
index 00000000..bbe6fc65
--- /dev/null
+++ b/modules/organize/helpers/organize_installer.php
@@ -0,0 +1,46 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class organize_installer {
+  static function deactivate() {
+    site_status::clear("organize_needs_rest");
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+      if (!module::is_active("rest")) {
+        site_status::warning(
+          t("The Organize module requires the Rest module.  " .
+            "<a href=\"%url\">Activate the Rest module now</a>",
+            array("url" => html::mark_clean(url::site("admin/modules")))),
+          "organize_needs_rest");
+      }
+
+      module::set_version("organize", $version = 2);
+    }
+  }
+
+  static function can_activate() {
+    $messages = array();
+    if (!module::is_active("rest")) {
+      $messages["warn"][] = t("The Organize module requires the Rest module.");
+    }
+    return $messages;
+  }
+}
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index da4a1b41..d69ab82c 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -21,12 +21,6 @@ class organize_theme {
   static function head($theme) {
     $item = $theme->item();
     if ($item && access::can("edit", $item) && $item->is_album()) {
-      // @todo: Defer loading js/css until we're loading the organize dialog as <script> and
-      // <link> elements so that we're not forcing them to be downloaded on every page view (which
-      // is expensive in terms of browser latency).  When we do that, we'll have to figure out an
-      // approach that lets us continue to use the Kohana cascading filesystem.
-      $theme->script("organize.js");
-      $theme->css("organize.css");
       $theme->css("organize_theme.css");
     }
   }