diff --git a/3.0/themes/pear4gallery3/icons/pear.css b/3.0/themes/pear4gallery3/icons/pear.css
index 1cb9cc07..03988e76 100644
--- a/3.0/themes/pear4gallery3/icons/pear.css
+++ b/3.0/themes/pear4gallery3/icons/pear.css
@@ -57,7 +57,7 @@ height:40px;
#logoButton {
display: block;
- z-index: 1000;
+ z-index: 100;
background: transparent url('pear_logo_sml.png') no-repeat center left;
width: 83px;
height: 40px;
@@ -84,7 +84,7 @@ background: transparent url('pear_logo_sml.png') no-repeat center left;
padding: 0px 0px;
width: auto;
float: right;
- z-index: 10000;
+ z-index: 100;
font-size: 12px;
top: 11px;
}
@@ -203,7 +203,7 @@ top: 10px;
height: 3px;
width: 154px;
float: right;
-z-index: 10000;
+z-index: 100;
}
.sliderView .smaller {
@@ -305,7 +305,7 @@ width: 381px;
float: left;
margin-left: 30px;
margin-top: 13px;
- z-index: 8000;
+ z-index: 800;
font-size: 12px;
text-shadow: #111111 0px -1px 1px;
}
@@ -400,8 +400,9 @@ background: url('slideshow_active.png') center left no-repeat;
top: 0;
width: 100%;
height: 100%;
- z-index: 99999;
+ z-index: 999;
background-color: #000000;
+ display: none;
}
#detailView .iMovieVideo {
@@ -535,7 +536,7 @@ background: url('slideshow_active.png') center left no-repeat;
bottom: 30px;
width: 99%;
text-align: center;
- z-index: 99999;
+ z-index: 999;
}
#hoverView #hoverViewMenu {
diff --git a/3.0/themes/pear4gallery3/js/pear.js b/3.0/themes/pear4gallery3/js/pear.js
index 6e9c2412..8f5ace87 100644
--- a/3.0/themes/pear4gallery3/js/pear.js
+++ b/3.0/themes/pear4gallery3/js/pear.js
@@ -148,9 +148,10 @@ function swatchImg(imageId)
if( detailViewMode )
{
//Image count.
- $.get(slideshowImages[currentImg][1]);
+ $.get(slideshowImages[currentImg][6]);
}
updateHash();
+ $('#info_detail').attr('href', slideshowImages[currentImg][1]);
}
function updateHash()
@@ -196,6 +197,8 @@ function mosaicResize()
myWidth=myWidth-7;
($('#paginator').length != 0) ? myHeight-=165: myHeight-=138;
+ myHeight = myHeight - $('#g-site-status').outerHeight(true);
+ $('#g-header').css('top', $('#gsNavBar').outerHeight(true)+$('#g-site-status').outerHeight(true)-4);
if ( !mosaicView )
{
@@ -219,11 +222,11 @@ function bodyLoad(viewMode, bgcolor) {
hash = window.location.hash;
var h = $.parseQuery(hash.substring(1));
if(h.img != undefined)
- currentImg = h.img;
+ currentImg = parseInt(h.img);
if(h.bgcolor != undefined)
swatchSkin(h.bgcolor);
if(h.viewMode == 'detail')
- focusImage(currentImg);
+ focusImage(currentImg, h.redirected);
else
viewMode = h.viewMode;
/* end parse hash */
@@ -341,7 +344,7 @@ function togglePlayPause()
slideShow=null;
}
}
-function focusImage(id)
+function focusImage(id, redirected)
{
currentImg=id;
$('#imageTitleLabel').html("
"+slideshowImages[id][4]+"
");
@@ -350,10 +353,12 @@ function focusImage(id)
swatchImg(id);
$('#detailView').fadeIn('slow');
hideHoverV = setTimeout("hideHoverView()",3000);
- //Image count.
detailViewMode=true;
updateHash();
- $.get(slideshowImages[currentImg][1]);
+ //Image count.
+ if(!redirected)
+ $.get(slideshowImages[currentImg][6]);
+ $('#info_detail').attr('href', slideshowImages[currentImg][1]);
}
var pearCarousel;
function startImageFlow()
diff --git a/3.0/themes/pear4gallery3/theme.info b/3.0/themes/pear4gallery3/theme.info
index ee4e256c..ff825e84 100644
--- a/3.0/themes/pear4gallery3/theme.info
+++ b/3.0/themes/pear4gallery3/theme.info
@@ -1,6 +1,6 @@
name = ".Pear Theme"
description = "A theme with the intention to mimic Apples mobile me gallery."
-version = 2.1
+version = 2.2
author = "Fredrik Erlandsson "
site = 1
admin = 0
diff --git a/3.0/themes/pear4gallery3/views/album.html.php b/3.0/themes/pear4gallery3/views/album.html.php
index 68f13a47..1b2920e5 100644
--- a/3.0/themes/pear4gallery3/views/album.html.php
+++ b/3.0/themes/pear4gallery3/views/album.html.php
@@ -42,8 +42,9 @@ $(function() {
if($child->is_album()):
$granchildren = $child->viewable()->children();
$offset = 0;
- $step = round(200/count($granchildren));
+ $step = round(200/min(count($granchildren),50));
foreach ($granchildren as $i => $granchild):?>
+ if(++$i > 50) break; ?>
if ($granchild->has_thumb()): ?>
= $granchild->thumb_img(array("style" => "display: none;")) ?>
@@ -68,7 +69,7 @@ endif;
var slideshowImages = new Array();
foreach ($children as $i => $child): ?>
if(!($child->is_album() || $child->is_movie())): ?>
- slideshowImages.push(['= $child->resize_url() ?>', '= $child->url() ?>', '= $child->width ?>','= $child->height ?>', '= $child->title ?>', '= $child->file_url() ?>']);
+ slideshowImages.push(['= $child->resize_url() ?>', '= url::site("exif/show/$child->id") ?>', '= $child->width ?>','= $child->height ?>', '= $child->title ?>', '= $child->file_url() ?>', '= $child->url() ?>']);
endif ?>
endforeach ?>
@@ -86,4 +87,4 @@ endif;
= $theme->album_bottom() ?>
= $theme->paginator() ?>
-
+
diff --git a/3.0/themes/pear4gallery3/views/hoverView.html.php b/3.0/themes/pear4gallery3/views/hoverView.html.php
index 418ba664..b38ad8f7 100644
--- a/3.0/themes/pear4gallery3/views/hoverView.html.php
+++ b/3.0/themes/pear4gallery3/views/hoverView.html.php
@@ -1,5 +1,5 @@
-
+
diff --git a/3.0/themes/pear4gallery3/views/page.html.php b/3.0/themes/pear4gallery3/views/page.html.php
index 6ed23784..eb2ce1d7 100644
--- a/3.0/themes/pear4gallery3/views/page.html.php
+++ b/3.0/themes/pear4gallery3/views/page.html.php
@@ -4,7 +4,7 @@
if(!($child->is_album() || $child->is_movie()))
if($child->url() == $_SERVER['REQUEST_URI']):?>
-
+
die(0) ?>
endif ?>