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

2 files changed, 9 insertions, 9 deletions

diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
index 0afe8126..099f5fdb 100644
--- a/modules/slideshow/helpers/slideshow_event.php
+++ b/modules/slideshow/helpers/slideshow_event.php
@@ -37,8 +37,8 @@ class slideshow_event_Core {
       $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,8 +47,8 @@ class slideshow_event_Core {
     $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"));
   }
 
@@ -56,8 +56,8 @@ class slideshow_event_Core {
     $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 +66,9 @@ class slideshow_event_Core {
       if (!$item->is_album()) {
         $item = $item->parent();
       }
-      return rss::url("gallery/album/{$item->id}?page_size=100");
+      return rss::url("gallery/album/{$item->id}?page_size=20");
     } else {
-      return rss::url("tag/tag/{$theme->tag()->id}?page_size=100");
+      return rss::url("tag/tag/{$theme->tag()->id}?page_size=20");
     }
   }
 }
diff --git a/modules/slideshow/helpers/slideshow_theme.php b/modules/slideshow/helpers/slideshow_theme.php
index 269a93ce..163d2bd8 100644
--- 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>";
   }
 }