From b65bc7beede797e2076f9c950b12038da116705f Mon Sep 17 00:00:00 2001 From: Fredrik Erlandsson Date: Tue, 10 Jan 2012 11:31:49 +0100 Subject: [PATCH] fixes #7, image animation --- admin/controllers/admin_theme_options.php | 28 ++++++++++++++++------- js/pear.js | 13 +++++++---- theme.info | 2 +- views/album.html.php | 5 ++++ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/admin/controllers/admin_theme_options.php b/admin/controllers/admin_theme_options.php index 583d869e..144ceead 100644 --- a/admin/controllers/admin_theme_options.php +++ b/admin/controllers/admin_theme_options.php @@ -111,13 +111,24 @@ class Admin_Theme_Options_Controller extends Admin_Controller { ->label(t("Google analytics code.")) ->value(module::get_var("th_pear4gallery3", "ga_code")); - /* Advanced Options - Photo page ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + /* Advanced Options - Mosaic page ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + + $group = $form->group("edit_theme_adv_mosaic")->label(t("Advanced Options - Mosaic Page")); + $group->dropdown("mosaic_effect") + ->label(t("Effect of image transition")) + ->options(array( + "blind" => t("Blinds the element away and shows it by blinding it in. (default)"), + "clip" => t("Clips the element on and off, vertically"), + "drop" => t("Drops the element away and shows it by dropping it in"), + "explode" => t("Explodes the element into multiple pieces"), + "fade" => t("Fades the element, by gradually changing its opacity"), + "fold" => t("Folds the element like a piece of paper"), + "puff" => t("Scale and fade out animations create the puff effect"), + "slide" => t("Slides the element out of the viewport"), + "scale" => t("Shrink and grow an element"), + "none" => t("Disable effects (faster switching)"))) + ->selected(module::get_var("th_pear4gallery3", "mosaic_effect", "blind")); /* - $group = $form->group("edit_theme_adv_photo")->label(t("Advanced Options - Photo Page")); - $group->dropdown("photo_popupbox") - ->label(t($sb_fb_caption) . " " . t("Mode")) - ->options(array("default" => t("Default (Slideshow/Preview)"), "preview" => t("Preview Only"), "none" => t("Disable"))) - ->selected(module::get_var("th_pear4gallery3", "photo_popupbox")); $group->dropdown("photo_descmode") ->label(t("Description Display Mode")) ->options(array("overlay_top" => t("Overlay Top"), "overlay_bottom" => t("Overlay Bottom"), "bottom" => t("Bottom"), "top" => t("Top"), "hide" => t("Hide"))) @@ -166,7 +177,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller { $help .= '

  • Advanced Options - General

    • '; - $help .= '

  • Advanced Options - Photo Page

    + $help .= '

  • Advanced Options - Mosaic Page

    • '; $help .= '

  • Maintenance

    Without changing image size, you can Mark all Resizes for Rebuild. @@ -196,6 +207,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller { module::clear_var("th_pear4gallery3", "show_sidebar"); module::clear_var("th_pear4gallery3", "sidebar_view"); module::clear_var("th_pear4gallery3", "ga_code"); + module::clear_var("th_pear4gallery3", "mosaic_effect"); } protected function reset_theme() { @@ -284,8 +296,8 @@ class Admin_Theme_Options_Controller extends Admin_Controller { $this->save_item_state("ga_code", $form->edit_theme_adv_main->ga_code->value, $form->edit_theme_adv_main->ga_code->value); // * Advanced Options - Photo page *************************************** + $this->save_item_state("mosaic_effect", $form->edit_theme_adv_mosaic->mosaic_effect->value != "blind", $form->edit_theme_adv_mosaic->mosaic_effect->value); /* - $this->save_item_state("photo_descmode", $photo_descmode != "overlay_top", $photo_descmode); $this->save_item_state("photo_popupbox", $photo_popupbox != "default", $photo_popupbox); $this->save_item_state("thumb_inpage", $form->edit_theme_adv_photo->thumb_inpage->value, TRUE); $this->save_item_state("hide_photometa", !$form->edit_theme_adv_photo->hide_photometa->value, FALSE); diff --git a/js/pear.js b/js/pear.js index c7d03c16..50a0d680 100644 --- a/js/pear.js +++ b/js/pear.js @@ -17,6 +17,7 @@ var pearCarousel; var hideHoverV = null; var hovering = false; var maxSize; +var mosaicEffect = ""; function thumbPadding() { var size, width, margin; @@ -203,11 +204,13 @@ function swatchImg(imageId) { iRatio = 1.3333; } if (mosaicView) { - $('#mosaicDetail').hide(); - $('#imageTitle').html("

    " + slideshowImages[imageId][4] + "

    "); - $('#mosaicImg').attr('src', slideshowImages[imageId][0]); - $('#mosaicImg').css('cursor', "pointer"); - $('#mosaicDetail').show("slow"); + var options = {}; + if ( mosaicEffect === "scale" ) { options = { percent: 0 }; } + $('#mosaicDetail').hide(mosaicEffect, options, "fast", function () { + $('#imageTitle').html("

    " + slideshowImages[imageId][4] + "

    "); + $('#mosaicImg').attr('src', slideshowImages[imageId][0]); + $('#mosaicImg').css('cursor', "pointer"); + $('#mosaicDetail').show(mosaicEffect, options, "slow");}); } mosaicResize(); diff --git a/theme.info b/theme.info index 24144ceb..07bba5d2 100644 --- a/theme.info +++ b/theme.info @@ -1,6 +1,6 @@ name = ".Pear Theme" description = "A theme with the intention to mimic Apples mobile me gallery." -version = 2.7.3 +version = 2.8 author = "Fredrik Erlandsson " site = 1 admin = 0 diff --git a/views/album.html.php b/views/album.html.php index ce17abed..d2dff831 100644 --- a/views/album.html.php +++ b/views/album.html.php @@ -2,6 +2,11 @@