Create a new thumb_menu() and convert Digibug over to use it.

1) Eliminate digibug_album.html

2) Get rid of the $(document).ready() in digibug.js and rename popUp() to
   digibug_popup() then just make direct calls to digibug_popup() in the
   menu urls.

1 files changed, 19 insertions, 7 deletions

diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php
index 6d127d72..4b8db5a2 100644
--- a/modules/digibug/helpers/digibug_menu.php
+++ b/modules/digibug/helpers/digibug_menu.php
@@ -28,12 +28,24 @@ class digibug_menu {
 
   static function photo($menu, $theme) {
     $item = $theme->item();
-    $csrf = access::csrf_token();
-    $menu
-      ->append(Menu::factory("link")
-               ->id("digibug")
-               ->label(t("Print with Digibug"))
-               ->url(url::site("digibug/print_photo/$item->id?csrf=$csrf"))
-               ->css_id("gDigibugLink"));
+    $menu->append(
+      Menu::factory("link")
+      ->id("digibug")
+      ->label(t("Print with Digibug"))
+      ->url("javascript:digibug_popup('" .
+            url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')")
+      ->css_id("gDigibugLink"));
+  }
+
+  static function thumb($menu, $theme, $item) {
+    if ($item->type == "photo" && access::can("view_full", $item)) {
+      $menu->append(
+        Menu::factory("link")
+        ->id("digibug")
+        ->label(t("Print with Digibug"))
+        ->url("javascript:digibug_popup('" .
+              url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')")
+        ->css_id("gDigibugLink"));
+    }
   }
 }