diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
| commit | 0733dc37fda27a5ba35f9020edf3c66aa41a95a0 (patch) | |
| tree | 6877946232f1b01b1c8709054c689f6658cef34f /modules/slideshow/helpers | |
| parent | 218493c50be9362d4abed6900a816308fee5d978 (diff) | |
| parent | 9379308f91a476f790fb8d444536719535c584e4 (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/gallery/tests/xss_data.txt
Diffstat (limited to 'modules/slideshow/helpers')
| -rw-r--r-- | modules/slideshow/helpers/slideshow_event.php | 22 | ||||
| -rw-r--r-- | modules/slideshow/helpers/slideshow_theme.php | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php index ce26b189..099f5fdb 100644 --- a/modules/slideshow/helpers/slideshow_event.php +++ b/modules/slideshow/helpers/slideshow_event.php @@ -37,9 +37,9 @@ 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) . "'})") - ->css_id("gSlideshowLink")); + ->url("javascript:cooliris.embed.show(" . + "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})") + ->css_id("g-slideshow-link")); } } @@ -47,18 +47,18 @@ 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) . "'})") - ->css_id("gSlideshowLink")); + ->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) . "'})") - ->css_id("gSlideshowLink")); + ->url("javascript:cooliris.embed.show(" . + "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})") + ->css_id("g-slideshow-link")); } private static function _feed_url($theme) { @@ -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>"; } } |