1 files changed, 100 insertions, 91 deletions

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 279f2013..c81af842 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -197,108 +197,117 @@ class gallery_Core {
     return $menu;
   }
 
-  static function context_menu($menu, $theme, $item) {
-    $page_type = $theme->page_type();
-    switch ($item->type) {
-    case "movie":
-      $edit_title = t("Edit this movie");
-      $delete_title = t("Delete this movie");
-      break;
-
-    case "album":
-      $edit_title = t("Edit this album");
-      $delete_title = t("Delete this album");
-      break;
-
-    default:
-      $edit_title = t("Edit this photo");
-      $delete_title = t("Delete this photo");
-      break;
-    }
-    $cover_title = t("Choose as the album cover");
-    $move_title = t("Move to another album");
-
-    $csrf = access::csrf_token();
-
+  static function context_menu($menu, $theme, $item, $thumb_css_selector) {
     $menu->append($options_menu = Menu::factory("submenu")
                   ->id("options_menu")
                   ->label(t("Options"))
                   ->css_class("ui-icon-carat-1-n"));
 
-    $options_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 (access::can("edit", $item)) {
+      $page_type = $theme->page_type();
+      switch ($item->type) {
+      case "movie":
+        $edit_title = t("Edit this movie");
+        $delete_title = t("Delete this movie");
+        break;
 
+      case "album":
+        $edit_title = t("Edit this album");
+        $delete_title = t("Delete this album");
+        break;
 
-    if ($item->is_photo() && graphics::can("rotate")) {
-      $options_menu
-        ->append(Menu::factory("link")
-                  ->id("rotate_ccw")
-                 ->label(t("Rotate 90° 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° clockwise"))
-                 ->css_class("ui-icon-rotate-cw")
-                 ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
-    }
+      default:
+        $edit_title = t("Edit this photo");
+        $delete_title = t("Delete this photo");
+        break;
+      }
+      $cover_title = t("Choose as the album cover");
+      $move_title = t("Move to another album");
 
-    // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
-    if ($page_type == "album") {
-      $options_menu
-        ->append(Menu::factory("dialog")
-                 ->id("move")
-                 ->label($move_title)
-                 ->css_class("ui-icon-folder-open")
-                 ->url(url::site("move/browse/$item->id")));
-    }
+      $csrf = access::csrf_token();
+
+      $options_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")));
 
-    $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 = " ";
+
+      if ($item->is_photo() && graphics::can("rotate")) {
+        $options_menu
+          ->append(
+            Menu::factory("ajax_link")
+            ->id("rotate_ccw")
+            ->label(t("Rotate 90° counter clockwise"))
+            ->css_class("ui-icon-rotate-ccw")
+            ->ajax_handler("function(data) { " .
+                           "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
+            ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type")))
+          ->append(
+            Menu::factory("ajax_link")
+            ->id("rotate_cw")
+            ->label(t("Rotate 90° clockwise"))
+            ->css_class("ui-icon-rotate-cw")
+            ->ajax_handler("function(data) { " .
+                           "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
+            ->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") {
+        $options_menu
+          ->append(Menu::factory("dialog")
+                   ->id("move")
+                   ->label($move_title)
+                   ->css_class("ui-icon-folder-open")
+                   ->url(url::site("move/browse/$item->id")));
       }
-      $options_menu
-        ->append(Menu::factory("link")
-                 ->id("make_album_cover")
-                 ->label($cover_title)
-                 ->css_class("ui-icon-star")
-                 ->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()) {
-      $options_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")));
+      $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 = " ";
+        }
+        $options_menu
+          ->append(Menu::factory("ajax_link")
+                   ->id("make_album_cover")
+                   ->label($cover_title)
+                   ->css_class("ui-icon-star")
+                   ->ajax_handler("function(data) { window.location.reload() }")
+                   ->url(url::site("quick/make_album_cover/$item->id?csrf=$csrf")))
+          ->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()) {
+        $options_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