2 files changed, 8 insertions, 6 deletions
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index a39b59a5..263dc38d 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -91,7 +91,7 @@ class Menu_Element_Link extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"gMenuElement$css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"gMenuLink $css_class\" href=\"$this->url\" " .
       "title=\"$this->label\">$this->label</a></li>";
   }
 }
@@ -111,7 +111,7 @@ class Menu_Element_Dialog extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"gMenuLink$css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"gDialogLink $css_class\" href=\"$this->url\" " .
            "title=\"$this->label\">$this->label</a></li>";
   }
 }
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 360e5e46..24dea729 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -111,14 +111,16 @@ class Theme_View_Core extends Gallery_View {
     return $menu->compact();
   }
 
-  public function thumb_menu($item) {
+  public function context_menu($item) {
     $menu = Menu::factory("root")
       ->append(Menu::factory("submenu")
-               ->id("options_menu")
+               ->id("context_menu")
                ->label(t("Options")))
-      ->css_class("gThumbMenu");
+      ->css_class("gContextMenu");
 
-    module::event("thumb_menu", $menu, $this, $item);
+    $page_type = Input::instance()->get("page_type");
+    gallery::context_menu($menu, $this, $item, $page_type);
+    module::event("context_menu", $menu, $this, $item, $page_type);
     return $menu->compact();
   }