From e0e882baabe9d4436c12bd57f903159c3b0274d9 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 26 Nov 2009 19:25:09 -0800 Subject: Fix the arguments to Item_Model::descendants_count() --- modules/slideshow/helpers/slideshow_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/slideshow/helpers/slideshow_event.php') diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php index 0afe8126..9b77dd42 100644 --- a/modules/slideshow/helpers/slideshow_event.php +++ b/modules/slideshow/helpers/slideshow_event.php @@ -32,7 +32,7 @@ class slideshow_event_Core { static function album_menu($menu, $theme) { $descendants_count = ORM::factory("item", $theme->item()->id) - ->descendants_count(array("type" => "photo")); + ->descendants_count(array(array("type", "=", "photo"))); if ($descendants_count > 1) { $menu->append(Menu::factory("link") ->id("slideshow") -- cgit v1.2.3 From e885ca161f1cff1c8b57190915dd42146c33bf66 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 26 Dec 2009 13:21:16 -0800 Subject: Reuse $theme->item() for our descendants_count() call. --- modules/slideshow/helpers/slideshow_event.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'modules/slideshow/helpers/slideshow_event.php') diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php index 9b77dd42..39bd8fda 100644 --- a/modules/slideshow/helpers/slideshow_event.php +++ b/modules/slideshow/helpers/slideshow_event.php @@ -31,9 +31,7 @@ class slideshow_event_Core { } static function album_menu($menu, $theme) { - $descendants_count = ORM::factory("item", $theme->item()->id) - ->descendants_count(array(array("type", "=", "photo"))); - if ($descendants_count > 1) { + if ($theme->item()->descendants_count(array(array("type", "=", "photo")))) { $menu->append(Menu::factory("link") ->id("slideshow") ->label(t("View slideshow")) -- cgit v1.2.3 From 5808ba48c8e5e212571ebd03e874a386dae92786 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 26 Dec 2009 13:24:12 -0800 Subject: 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(-) (limited to 'modules/slideshow/helpers/slideshow_event.php') diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php index 39bd8fda..baf896fe 100644 --- a/modules/slideshow/helpers/slideshow_event.php +++ b/modules/slideshow/helpers/slideshow_event.php @@ -35,8 +35,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")); } } @@ -45,8 +45,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")); } @@ -54,8 +54,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")); } @@ -64,9 +64,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}"); } } } 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 ""; } } -- cgit v1.2.3 From 38f2784fbbb0661dc57627d2878cb640bbffe271 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 27 Dec 2009 13:40:38 -0800 Subject: Allow users to upscale images in the slideshow by making the maxScale parameter configurable in Admin > Settings > Advanced. You specify the scaling factor. Normally, images fill the stage; 0 -> never scale up; any other positive number S --> scale up to S times the original size of the photo (but never bigger than the stage) --- modules/slideshow/helpers/slideshow_event.php | 9 ++++++--- modules/slideshow/helpers/slideshow_installer.php | 12 ++++++++++++ modules/slideshow/module.info | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) (limited to 'modules/slideshow/helpers/slideshow_event.php') diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php index baf896fe..c4d7c56d 100644 --- a/modules/slideshow/helpers/slideshow_event.php +++ b/modules/slideshow/helpers/slideshow_event.php @@ -31,31 +31,34 @@ class slideshow_event_Core { } static function album_menu($menu, $theme) { + $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:cooliris.embed.show(" . - "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})") + "{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:cooliris.embed.show(" . - "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})") + "{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:cooliris.embed.show(" . - "{maxScale:0,feed:'" . self::_feed_url($theme) . "'})") + "{maxScale:$max_scale,feed:'" . self::_feed_url($theme) . "'})") ->css_id("g-slideshow-link")); } diff --git a/modules/slideshow/helpers/slideshow_installer.php b/modules/slideshow/helpers/slideshow_installer.php index 56874a6a..03f3332c 100644 --- a/modules/slideshow/helpers/slideshow_installer.php +++ b/modules/slideshow/helpers/slideshow_installer.php @@ -18,6 +18,18 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class slideshow_installer { + static function install() { + module::set_var("slideshow", "max_scale", 0); + module::set_version("slideshow", 2); + } + + static function upgrade($version) { + if ($version == 1) { + module::set_var("slideshow", "max_scale", 0); + module::set_version("slideshow", $version = 2); + } + } + static function deactivate() { site_status::clear("slideshow_needs_rss"); } diff --git a/modules/slideshow/module.info b/modules/slideshow/module.info index 6841199a..b56eac81 100644 --- a/modules/slideshow/module.info +++ b/modules/slideshow/module.info @@ -1,3 +1,3 @@ name = "Slideshow" description = "Allows users to view a slideshow of photos" -version = 1 +version = 2 -- cgit v1.2.3