public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Limit of n:o thumbs to show when skimming.

Browse Source 
Support for exif data from detailview (no longer links to the photo page), breaks the view count.
This commit is contained in:
Fredrik Erlandsson 2011-06-16 10:16:37 +02:00
parent 98195b4ce0
commit 77c42a1e5d
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
icons/pear.css
View File

@ -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 {

1
js/pear.js
View File

@ -151,6 +151,7 @@ function swatchImg(imageId)
$.get(slideshowImages[currentImg][1]);
}
updateHash();
$('#info_detail').attr('href', slideshowImages[currentImg][1]);
}
function updateHash()

5
views/album.html.php
View File

@ -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;")) ?>
<div class="skimm_div" style="height: 200px; width: <?=$step?>px; left: <?=$offset?>px; top: 0px;" onmouseover="$('#thumb_<?=$child->id?>').attr('src', '<?=$granchild->thumb_url()?>');skimimg=<?=$i?>;" id="area_<?=$granchild->id?>"></div>
@ -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() ?>']);
<? endif ?>
<? endforeach ?>
</script>

4
views/hoverView.html.php
View File

@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<div id="detailView" style="display: none; z-index:99997;" onmousemove="showHoverView();">
<div id="detailView" onmousemove="showHoverView();">
<div class="overlay"> </div>
<div class="content">
<div class="imageContainer">
@ -16,7 +16,7 @@
<div id="pause_detail" style="display: none;" title="Pause" class="pause_detail" onclick="togglePlayPause();"> </div>
<div id="play_detail" style="display: none;" title="Play" class="play_detail" onclick="togglePlayPause();"> </div>
<div id="next_detail" title="(N)ext" class="next_detail"> </div>
<div id="info_detail" title="Show more information about this photo" class="info_detail" onclick="document.location=slideshowImages[currentImg][1]"> </div>
<div id="info_detail" title="Show more information about this photo" class="info_detail g-dialog-link"> </div>
</div>
</div>
</div>