Merge branch 'master' of git@github.com:bharat/gallery3 into bharat_branch

4 files changed, 105 insertions, 188 deletions

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 476e9cbe..085965a2 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -196,4 +196,106 @@ class gallery_Core {
                ->url(url::site("admin/maintenance")));
     return $menu;
   }
+
+  static function context_menu($menu, $theme, $item, $page_type) {
+    switch ($item->type) {
+    case "movie":
+      $edit_title = t("Edit this movie");
+      $move_title = t("Move this movie to another album");
+      $cover_title = t("Choose this movie as the album cover");
+      $delete_title = t("Delete this movie");
+      break;
+
+    case "album":
+      $edit_title = t("Edit this album");
+      $move_title = t("Move this album to another album");
+      $cover_title = t("Choose this album as the album cover");
+      $delete_title = t("Delete this album");
+      break;
+
+    default:
+      $edit_title = t("Edit this photo");
+      $move_title = t("Move this photo to another album");
+      $cover_title = t("Choose this photo as the album cover");
+      $delete_title = t("Delete this photo");
+      break;
+    }
+
+    $csrf = access::csrf_token();
+    $menu->append(Menu::factory("dialog")
+                  ->id("edit")
+                  ->label($edit_title)
+                  ->css_clasS("ui-icon-pencil")
+                  ->url(url::site("quick/form_edit/$item->id?page_type=$page_type")));
+
+
+    if ($item->is_photo() && graphics::can("rotate")) {
+      $menu
+        ->append(Menu::factory("link")
+                  ->id("rotate_ccw")
+                 ->label(t("Rotate 90 degrees counter clockwise"))
+                 ->css_class("ui-icon-rotate-ccw")
+                 ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type")))
+        ->append(Menu::factory("link")
+                  ->id("rotate_cw")
+                 ->label(t("Rotate 90 degrees clockwise"))
+                 ->css_class("ui-icon-rotate-cw")
+                 ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
+    }
+
+    // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
+    if ($page_type == "album") {
+      $menu
+        ->append(Menu::factory("dialog")
+                 ->id("move")
+                 ->label($move_title)
+                 ->css_class("ui-icon-folder-open")
+                 ->url(url::site("move/browse/$item->id")));
+    }
+
+    $parent = $item->parent();
+    if (access::can("edit", $parent)) {
+      // We can't make this item the highlight if it's an album with no album cover, or if it's
+      // already the album cover.
+      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
+          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
+          $parent->album_cover_item_id == $item->id) {
+        $disabledState = " ui-state-disabled";
+      } else {
+        $disabledState = " ";
+      }
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("make_album_cover")
+                 ->label($cover_title)
+                 ->css_class($disabledState)
+                 ->url(
+                   url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type")))
+        ->append(Menu::factory("dialog")
+                 ->id("delete")
+                 ->label($delete_title)
+                 ->css_class("ui-icon-trash")
+                 ->css_id("gQuickDelete")
+                 ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type")));
+    }
+
+    if ($item->is_album()) {
+      $menu
+        ->append(Menu::factory("dialog")
+                 ->id("add_item")
+                 ->label(t("Add a photo"))
+                 ->css_class("add_item")
+                 ->url(url::site("simple_uploader/app/$item->id")))
+        ->append(Menu::factory("dialog")
+                 ->id("add_album")
+                 ->label(t("Add an album"))
+                 ->css_class("add_album")
+                 ->url(url::site("form/add/albums/$item->id?type=album")))
+        ->append(Menu::factory("dialog")
+                 ->id("edit_permissions")
+                 ->label(t("Edit permissions"))
+                 ->css_class("permissions")
+                 ->url(url::site("permissions/browse/$item->id")));
+    }
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_quick.php b/modules/gallery/helpers/gallery_quick.php
deleted file mode 100644
index 8a92890b..00000000
--- a/modules/gallery/helpers/gallery_quick.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?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 gallery_quick_Core {
-  static function get_quick_buttons($item, $page_type) {
-    $buttons = self::buttons($item, $page_type);
-    foreach (module::active() as $module) {
-      if ($module->name == "gallery") {
-        continue;
-      }
-      $class_name = "{$module->name}_quick";
-      if (method_exists($class_name, "buttons")) {
-        $module_buttons = call_user_func(array($class_name, "buttons"), $item, $page_type);
-        foreach (array("left", "center", "right", "additional") as $position) {
-          if (!empty($module_buttons[$position])) {
-            $buttons[$position] = array_merge($buttons[$position], $module_buttons[$position]);
-          }
-        }
-      }
-    }
-
-    $sorted_buttons->main = array();
-    foreach (array("left", "center", "right") as $position) {
-      $sorted_buttons->main = array_merge($sorted_buttons->main, $buttons[$position]);
-    }
-
-    $sorted_buttons->additional = $buttons["additional"];
-    $max_display = empty($sorted_buttons->additional) ? 6 : 5;
-    if (count($sorted_buttons->main) >= $max_display) {
-      $to_move = array_slice($sorted_buttons->main, 5);
-      $sorted_buttons->additional = array_merge($to_move, $sorted_buttons->additional);
-      for ($i = count($sorted_buttons->main); $i >= 5; $i--) {
-        unset($sorted_buttons->main[$i]);
-      }
-    }
-
-    return $sorted_buttons;
-  }
-
-  static function buttons($item, $page_type) {
-    $elements = array("left" => array(), "center" => array(), "right" => array(),
-                      "additional"  => array());
-    switch ($item->type) {
-    case "movie":
-      $edit_title = t("Edit this movie");
-      $move_title = t("Move this movie to another album");
-      $cover_title = t("Choose this movie as the album cover");
-      $delete_title = t("Delete this movie");
-      break;
-    case "album":
-      $edit_title = t("Edit this album");
-      $move_title = t("Move this album to another album");
-      $cover_title = t("Choose this album as the album cover");
-      $delete_title = t("Delete this album");
-      break;
-    default:
-      $edit_title = t("Edit this photo");
-      $move_title = t("Move this photo to another album");
-      $cover_title = t("Choose this photo as the album cover");
-      $delete_title = t("Delete this photo");
-      break;
-    }
-
-    $csrf = access::csrf_token();
-    $elements["left"][] = (object)array(
-      "title" => $edit_title,
-      "class" => "gDialogLink gButtonLink",
-      "icon" => "ui-icon-pencil",
-      "href" => url::site("quick/form_edit/$item->id?page_type=$page_type"));
-
-    if ($item->is_photo() && graphics::can("rotate")) {
-      $elements["left"][] =
-        (object)array(
-          "title" => t("Rotate 90 degrees counter clockwise"),
-          "class" => "gButtonLink",
-          "icon" => "ui-icon-rotate-ccw",
-          "href" => url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type"));
-      $elements["left"][] =
-        (object)array(
-          "title" => t("Rotate 90 degrees clockwise"),
-          "class" => "gButtonLink",
-          "icon" => "ui-icon-rotate-cw",
-          "href" => url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type"));
-    }
-
-    // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
-    if ($page_type == "album") {
-      $elements["left"][] = (object)array(
-        "title" => $move_title,
-        "class" => "gDialogLink gButtonLink",
-        "icon" => "ui-icon-folder-open",
-        "href" => url::site("move/browse/$item->id"));
-    }
-
-    $parent = $item->parent();
-    if (access::can("edit", $parent)) {
-      // We can't make this item the highlight if it's an album with no album cover, or if it's
-      // already the album cover.
-      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
-          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
-          $parent->album_cover_item_id == $item->id) {
-        $disabledState = " ui-state-disabled";
-      } else {
-        $disabledState = " ";
-      }
-      $elements["right"][] = (object)array(
-        "title" => $cover_title,
-        "class" => "gButtonLink$disabledState",
-        "icon" => "ui-icon-star",
-        "href" => url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type"));
-
-      $elements["right"][] = (object)array(
-        "title" => $delete_title,
-        "class" => "gDialogLink gButtonLink",
-        "icon" => "ui-icon-trash",
-        "id" => "gQuickDelete",
-        "href" => url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type"));
-    }
-
-    if ($item->is_album()) {
-      $elements["additional"][] = (object)array(
-        "title" => t("Add a photo"),
-        "class" => "add_item gDialogLink",
-        "href" => url::site("simple_uploader/app/$item->id"));
-      $elements["additional"][] = (object)array(
-        "title" => t("Add an album"),
-        "class" => "add_album gDialogLink",
-        "href" => url::site("form/add/albums/$item->id?type=album"));
-      $elements["additional"][] = (object)array(
-        "title" => t("Edit permissions"),
-        "class" => "permissions gDialogLink",
-        "href" => url::site("permissions/browse/$item->id"));
-    }
-    return $elements;
-  }
-}
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 903827cc..69c5a091 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -24,11 +24,6 @@ class gallery_theme_Core {
     if ($session->get("debug")) {
       $theme->css("debug.css");
     }
-    if (($theme->page_type == "album" || $theme->page_type == "photo")
-        && access::can("edit", $theme->item())) {
-      $theme->css("quick.css");
-      $theme->script("quick.js");
-    }
 
     if (module::is_active("rss")) {
       if ($item = $theme->item()) {
@@ -51,32 +46,6 @@ class gallery_theme_Core {
     return $buf;
   }
 
-  static function resize_top($theme, $item) {
-    if (access::can("edit", $item)) {
-      $edit_link = url::site("quick/pane/$item->id?page_type=photo");
-      return "<div class=\"gQuick\" href=\"$edit_link\">";
-    }
-  }
-
-  static function resize_bottom($theme, $item) {
-    if (access::can("edit", $item)) {
-      return "</div>";
-    }
-  }
-
-  static function thumb_top($theme, $child) {
-    if (access::can("edit", $child)) {
-      $edit_link = url::site("quick/pane/$child->id?page_type=album");
-      return "<div class=\"gQuick\" href=\"$edit_link\">";
-    }
-  }
-
-  static function thumb_bottom($theme, $child) {
-    if (access::can("edit", $child)) {
-      return "</div>";
-    }
-  }
-
   static function admin_head($theme) {
     $theme->script("gallery.panel.js");
     $session = Session::instance();
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 0d483206..03d538a9 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -274,11 +274,9 @@ class module_Core {
     array_shift($args);
     $function = str_replace(".", "_", $name);
 
-    foreach (self::$modules as $module) {
-      if (!$module->active) {
-        continue;
-      }
-
+    // @todo: consider calling gallery_event first, since for things menus we need it to do some
+    // setup
+    foreach (self::$active as $module) {
       $class = "{$module->name}_event";
       if (method_exists($class, $function)) {
         call_user_func_array(array($class, $function), $args);