Skip to content

Commit

Permalink
Roll forward to the new CoolIris slideshow -- it appears to be ready
Browse files Browse the repository at this point in the history
now.
  • Loading branch information
bharat committed Dec 26, 2009
1 parent e885ca1 commit 5808ba4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions modules/slideshow/helpers/slideshow_event.php
Expand Up @@ -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"));
}
}
Expand All @@ -45,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"));
}

Expand All @@ -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}");
}
}
}
2 changes: 1 addition & 1 deletion modules/slideshow/helpers/slideshow_theme.php
Expand Up @@ -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>";
}
}

0 comments on commit 5808ba4

Please sign in to comment.