Fix-ups for d98b85f7d3142676e6b4f407a18ed81564823f88

- Pass the CSS selector of the active image in as an arg to site_menu
  so that quick operations know what they're operating on.
- Change the ids from g-{photo,movie}-id to the generic g-item-id
- Initialize ajax handlers for site menu on the photo and movie page
- Drop the movie context menu, it's now in the site menu

3 files changed, 9 insertions, 6 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 9b3aa82d..89ad6a4c 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -167,7 +167,7 @@ class gallery_event_Core {
     }
   }
 
-  static function site_menu($menu, $theme) {
+  static function site_menu($menu, $theme, $item_css_selector) {
     if ($theme->page_subtype != "login") {
       $menu->append(Menu::factory("link")
                     ->id("home")
@@ -239,6 +239,9 @@ class gallery_event_Core {
           }
         }
 
+        $csrf = access::csrf_token();
+        $theme_item = $theme->item();
+        $page_type = $theme->page_type();
         if ($item->is_photo() && graphics::can("rotate")) {
           $options_menu
             ->append(
@@ -247,7 +250,7 @@ class gallery_event_Core {
               ->label(t("Rotate 90° counter clockwise"))
               ->css_class("ui-icon-rotate-ccw")
               ->ajax_handler("function(data) { " .
-                             "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
+                             "\$.gallery_replace_image(data, \$('$item_css_selector')) }")
               ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&from_id=$theme_item->id&page_type=$page_type")))
             ->append(
               Menu::factory("ajax_link")
@@ -255,7 +258,7 @@ class gallery_event_Core {
               ->label(t("Rotate 90° clockwise"))
               ->css_class("ui-icon-rotate-cw")
               ->ajax_handler("function(data) { " .
-                             "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
+                             "\$.gallery_replace_image(data, \$('$item_css_selector')) }")
               ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&from_id=$theme_item->id&page_type=$page_type")));
         }
 
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 8b432fb6..6246c6f1 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -86,9 +86,9 @@ class Theme_View_Core extends Gallery_View {
     return $menu->render();
   }
 
-  public function site_menu() {
+  public function site_menu($item_css_selector) {
     $menu = Menu::factory("root");
-    module::event("site_menu", $menu, $this);
+    module::event("site_menu", $menu, $this, $item_css_selector);
     return $menu->render();
   }
 
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 7fc37325..409ed3cc 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -674,7 +674,7 @@ class Item_Model extends ORM_MPTT {
     $v->attrs = array_merge($extra_attrs,
       array("style" => "display:block;width:{$this->width}px;height:{$this->height}px"));
     if (empty($v->attrs["id"])) {
-       $v->attrs["id"] = "g-movie-id-{$this->id}";
+       $v->attrs["id"] = "g-item-id-{$this->id}";
     }
     return $v;
   }