Merge branch 'master' into talmdal_dev

Conflicts: modules/organize/js/organize.js
gallery · Dec 27, 2009 · 0a48212 · 0a48212
2 parents bccb6fc + 55f9408
commit 0a48212
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
@@ -162,16 +162,8 @@
     },
 
     set_handlers: function() {
-      $("#g-organize-microthumb-panel")
-        .selectable({
-          filter: ".g-organize-microthumb-grid-cell",
-          selected: function(event, ui) {
-            $(ui.selected).children(".g-organize-microthumb").addClass("ui-state-highlight");
-          },
-          unselected: function(event, ui) {
-            $(ui.unselected).children(".g-organize-microthumb").removeClass("ui-state-highlight");
-          }
-        })
+      $("#g-organize-microthumb-grid")
+        .selectable({filter: ".g-organize-microthumb-grid-cell"})
         .droppable($.organize.content_droppable);
       $(".g-organize-microthumb-grid-cell")
         .draggable($.organize.micro_thumb_draggable)

diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
@@ -31,14 +31,12 @@ static function module_change($changes) {
   }
 
   static function album_menu($menu, $theme) {
-    $descendants_count = ORM::factory("item", $theme->item()->id)
-      ->descendants_count(array(array("type", "=", "photo")));
-    if ($descendants_count > 1) {
+    if ($theme->item()->descendants_count(array(array("type", "=", "photo")))) {
       $menu->append(Menu::factory("link")
                     ->id("slideshow")
                     ->label(t("View slideshow"))
-                    ->url("javascript:PicLensLite.start(" .
-                          "{maxScale:0,feedUrl:'" . self::_feed_url($theme) . "'})")
+                    ->url("javascript:cooliris.embed.show(" .
+                          "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})")
                     ->css_id("g-slideshow-link"));
     }
   }
@@ -47,17 +45,17 @@ static function photo_menu($menu, $theme) {
     $menu->append(Menu::factory("link")
                   ->id("slideshow")
                   ->label(t("View slideshow"))
-                  ->url("javascript:PicLensLite.start(" .
-                        "{maxScale:0,feedUrl:'" . self::_feed_url($theme) . "'})")
+                  ->url("javascript:cooliris.embed.show(" .
+                        "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})")
                   ->css_id("g-slideshow-link"));
   }
 
   static function tag_menu($menu, $theme) {
     $menu->append(Menu::factory("link")
                   ->id("slideshow")
                   ->label(t("View slideshow"))
-                  ->url("javascript:PicLensLite.start(" .
-                        "{maxScale:0,feedUrl:'" . self::_feed_url($theme) . "'})")
+                  ->url("javascript:cooliris.embed.show(" .
+                        "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})")
                   ->css_id("g-slideshow-link"));
   }
 
@@ -66,9 +64,9 @@ private static function _feed_url($theme) {
       if (!$item->is_album()) {
         $item = $item->parent();
       }
-      return rss::url("gallery/album/{$item->id}?page_size=100");
+      return rss::url("gallery/album/{$item->id}");
     } else {
-      return rss::url("tag/tag/{$theme->tag()->id}?page_size=100");
+      return rss::url("tag/tag/{$theme->tag()->id}");
     }
   }
 }
diff --git a/modules/slideshow/helpers/slideshow_theme.php b/modules/slideshow/helpers/slideshow_theme.php
@@ -20,7 +20,7 @@
 class slideshow_theme_Core {
   static function head($theme) {
     $proto = (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] === "off") ? "http" : "https";
-    return "<script src=\"$proto://lite.piclens.com/current/piclens_optimized.js\" " .
+    return "<script src=\"$proto://apps.cooliris.com/slideshow/go.js\" " .
       "type=\"text/javascript\"></script>";
   }
 }