diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 |
| commit | 399abbc3a754cf5fdcfdff113446e1bc264091e2 (patch) | |
| tree | 592188568e15325d59e51bf19cfdf667fae8d86d /modules/slideshow/helpers/slideshow_event.php | |
| parent | 925a6a2220760cb7daacee1ab80a07b61b3a30a1 (diff) | |
| parent | 64e5efd57ba1479179c202e1b76b6eeb42d2924c (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/slideshow/helpers/slideshow_event.php')
| -rw-r--r-- | modules/slideshow/helpers/slideshow_event.php | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php index 0afe8126..c4d7c56d 100644 --- a/modules/slideshow/helpers/slideshow_event.php +++ b/modules/slideshow/helpers/slideshow_event.php @@ -31,33 +31,34 @@ class slideshow_event_Core { } static function album_menu($menu, $theme) { - $descendants_count = ORM::factory("item", $theme->item()->id) - ->descendants_count(array("type" => "photo")); - if ($descendants_count > 1) { + $max_scale = module::get_var("slideshow", "max_scale"); + 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:$max_scale,feed:'" . self::_feed_url($theme) . "'})") ->css_id("g-slideshow-link")); } } static function photo_menu($menu, $theme) { + $max_scale = module::get_var("slideshow", "max_scale"); $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:$max_scale,feed:'" . self::_feed_url($theme) . "'})") ->css_id("g-slideshow-link")); } static function tag_menu($menu, $theme) { + $max_scale = module::get_var("slideshow", "max_scale"); $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:$max_scale,feed:'" . self::_feed_url($theme) . "'})") ->css_id("g-slideshow-link")); } @@ -66,9 +67,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}"); } else { - return rss::url("tag/tag/{$theme->tag()->id}?page_size=100"); + return rss::url("tag/tag/{$theme->tag()->id}"); } } } |