Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

3 files changed, 20 insertions, 19 deletions

diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_event.php
index f1d4fc1d..d2830b80 100644
--- a/modules/digibug/helpers/digibug_menu.php
+++ b/modules/digibug/helpers/digibug_event.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class digibug_menu {
-  static function admin($menu, $theme) {
+class digibug_event_Core {
+  static function admin_menu($menu, $theme) {
     $menu->get("settings_menu")
       ->append(Menu::factory("link")
         ->id("digibug_menu")
@@ -26,24 +26,25 @@ class digibug_menu {
         ->url(url::site("admin/digibug")));
   }
 
-  static function photo($menu, $theme) {
+  static function photo_menu($menu, $theme) {
     $item = $theme->item();
-    $menu->append(
-      Menu::factory("link")
-      ->id("digibug")
-      ->label(t("Print with Digibug"))
-      ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
-      ->css_id("gDigibugLink"));
+    $menu->append(Menu::factory("link")
+                  ->id("digibug")
+                  ->label(t("Print with Digibug"))
+                  ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
+                  ->css_id("gDigibugLink")
+                    ->css_class("ui-icon-print"));
   }
 
-  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(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
-        ->css_id("gDigibugLink"));
+  static function context_menu($menu, $theme, $item) {
+    if ($item->type == "photo") {
+      $menu->get("options_menu")
+        ->append(Menu::factory("link")
+                 ->id("digibug")
+                 ->label(t("Print with Digibug"))
+                 ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
+                 ->css_id("gDigibugLink")
+                 ->css_class("ui-icon-print"));
     }
   }
 }
diff --git a/modules/digibug/helpers/digibug_installer.php b/modules/digibug/helpers/digibug_installer.php
index 1cd78b44..7e8145d2 100644
--- a/modules/digibug/helpers/digibug_installer.php
+++ b/modules/digibug/helpers/digibug_installer.php
@@ -26,7 +26,7 @@ class digibug_installer {
                 `request_date` TIMESTAMP NOT NULL DEFAULT current_timestamp,
                 `item_id` int(9) NOT NULL,
                PRIMARY KEY (`id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
 
     module::set_var("digibug", "company_id", "3153");
     module::set_var("digibug", "event_id", "8491");
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index f94d07c6..ceda55b5 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -19,6 +19,6 @@
  */
 class digibug_theme_Core {
   static function head($theme) {
-    $theme->script("modules/digibug/js/digibug.js");
+    $theme->script("digibug.js");
   }
 }