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

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 50 insertions, 0 deletions

diff --git a/modules/digibug/helpers/digibug_event.php b/modules/digibug/helpers/digibug_event.php
new file mode 100644
index 00000000..d2830b80
--- /dev/null
+++ b/modules/digibug/helpers/digibug_event.php
@@ -0,0 +1,50 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 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 digibug_event_Core {
+  static function admin_menu($menu, $theme) {
+    $menu->get("settings_menu")
+      ->append(Menu::factory("link")
+        ->id("digibug_menu")
+        ->label(t("Digibug"))
+        ->url(url::site("admin/digibug")));
+  }
+
+  static function photo_menu($menu, $theme) {
+    $item = $theme->item();
+    $menu->append(Menu::factory("link")
+                  ->id("digibug")
+                  ->label(t("Print with Digibug"))
+                  ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
+                  ->css_id("gDigibugLink")
+                    ->css_class("ui-icon-print"));
+  }
+
+  static function context_menu($menu, $theme, $item) {
+    if ($item->type == "photo") {
+      $menu->get("options_menu")
+        ->append(Menu::factory("link")
+                 ->id("digibug")
+                 ->label(t("Print with Digibug"))
+                 ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
+                 ->css_id("gDigibugLink")
+                 ->css_class("ui-icon-print"));
+    }
+  }
+}