Merge commit 'upstream/master'

Conflicts:

	modules/akismet/views/admin_akismet.html.php
	modules/comment/helpers/comment_rss.php
	modules/gallery/helpers/gallery_rss.php
	modules/gallery/libraries/I18n.php
	modules/gallery/views/permissions_browse.html.php
	modules/gallery/views/simple_uploader.html.php
	modules/info/views/info_block.html.php
	modules/organize/controllers/organize.php
	modules/organize/views/organize.html.php
	modules/organize/views/organize_album.html.php
	themes/default/views/album.html.php
	themes/default/views/movie.html.php
	themes/default/views/photo.html.php

1 files changed, 13 insertions, 13 deletions

diff --git a/modules/digibug/helpers/digibug_event.php b/modules/digibug/helpers/digibug_event.php
index c4f9e560..d2830b80 100644
--- a/modules/digibug/helpers/digibug_event.php
+++ b/modules/digibug/helpers/digibug_event.php
@@ -28,23 +28,23 @@ class digibug_event_Core {
 
   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($menu, $theme, $item) {
+  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"));
+        ->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"));
     }
   }
 }