From 08f11ce90edae83729537323925f167ef11b659e Mon Sep 17 00:00:00 2001
From: Florent Paterno <florent.paterno@gmail.com>
Date: Mon, 1 Mar 2010 17:23:56 +0100
Subject: Fix bug #1015 : repeated ids are prohibited

---
 modules/organize/helpers/organize_event.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'modules/organize/helpers/organize_event.php')

diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 4b048630..a9d64637 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -26,7 +26,7 @@ class organize_event_Core {
         ->append(Menu::factory("dialog")
                  ->id("organize")
                  ->label(t("Organize album"))
-                 ->css_id("g-organize-link")
+                 ->css_id("g-menu-organize-link")
                  ->url(url::site("organize/dialog/{$item->id}")));
     }
   }
@@ -37,8 +37,7 @@ class organize_event_Core {
         ->append(Menu::factory("dialog")
                  ->id("organize")
                  ->label(t("Organize album"))
-                 ->css_id("g-organize-link")
-                 ->css_class("ui-icon-folder-open")
+                 ->css_class("ui-icon-folder-open g-organize-link")
                  ->url(url::site("organize/dialog/{$item->id}")));
     }
   }
-- 
cgit v1.2.3


From 32fa15ca3a54ef0266f4dd8ce0edb570ad526df7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 9 May 2010 20:39:31 -0700
Subject: Add dependency checking to insure the administrator is notified if
 the rest module is deactivated

---
 modules/organize/helpers/organize_event.php     | 18 ++++++++++++++
 modules/organize/helpers/organize_installer.php | 32 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 modules/organize/helpers/organize_installer.php

(limited to 'modules/organize/helpers/organize_event.php')

diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index a9d64637..c7d08893 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..7585438f
--- /dev/null
+++ b/modules/organize/helpers/organize_installer.php
@@ -0,0 +1,32 @@
+<?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 can_activate() {
+    $messages = array();
+    if (!module::is_active("rest")) {
+      $messages["warn"][] = t("The Organize module requires the Rest module.");
+    }
+    return $messages;
+  }
+}
-- 
cgit v1.2.3


From d96ce71f1a35b8659bec7226f3902a052485b0f9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 15 Jun 2010 15:29:45 -0700
Subject: Remove a stray period.

---
 modules/organize/helpers/organize_event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/organize/helpers/organize_event.php')

diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index c7d08893..ae05fb5d 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -51,7 +51,7 @@ class organize_event_Core {
   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..  " .
+        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");
-- 
cgit v1.2.3