From 5808ba48c8e5e212571ebd03e874a386dae92786 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 26 Dec 2009 13:24:12 -0800 Subject: [PATCH] Roll forward to the new CoolIris slideshow -- it appears to be ready now. --- modules/slideshow/helpers/slideshow_event.php | 16 ++++++++-------- modules/slideshow/helpers/slideshow_theme.php | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php index 39bd8fda3e..baf896fe66 100644 --- a/modules/slideshow/helpers/slideshow_event.php +++ b/modules/slideshow/helpers/slideshow_event.php @@ -35,8 +35,8 @@ static function album_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")); } } @@ -45,8 +45,8 @@ 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")); } @@ -54,8 +54,8 @@ 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")); } @@ -64,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 index 269a93ce01..163d2bd8e4 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 ""; } }