Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 21:15:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update jg to latest preview release and try once more to really justify the whole gallery

Browse source
This commit is contained in:
marijus 2014-09-20 15:40:40 +02:00
parent 1c56442818
commit 9feb619bea
5 changed files with 671 additions and 605 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1234
library/justifiedGallery/dist/js/jquery.justifiedGallery.js vendored
View file

File diff suppressed because it is too large Load diff

15
mod/photos.php
View file

@ -703,7 +703,7 @@ function photos_content(&$a) {
if(count($r)) {
$twist = 'rotright';
$o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
$o .= '<div id="photo-album-contents-' . $a->pager['page'] . '">';
$o .= '<div id="photo-album-contents">';
foreach($r as $rr) {
@ -758,20 +758,15 @@ function photos_content(&$a) {
echo $ajaxout;
killme();
}
echo '<div id="photo-album-contents-' . $a->pager['page'] . '">';
echo $ajaxout;
echo '</div>';
echo '<script>justifyPhotos(' . $a->pager['page'] . ');</script>';
echo '<script>justifyPhotosAjax();</script>';
killme();
}
$o .= '</div>'; // photo-album-contents
$o .= '<script>justifyPhotos(' . $a->pager['page'] . ');</script>';
$o .= '<div id="page-end"></div>';
$o .= '</div>'; // photo-album-contents
$o .= '<div id="photo-album-end"></div>';
$o .= '<script>$(document).ready(function() { loadingPage = false;});</script>';
$o .= '<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>';
$o .= '<div id="page-spinner"></div>';
// $o .= paginate($a);
@ -1226,7 +1221,6 @@ function photos_content(&$a) {
if($photos) {
$o = replace_macros(get_markup_template('photosajax.tpl'),array(
'$photos' => $photos,
'$page' => $a->pager['page']
));
}
else {
@ -1243,7 +1237,6 @@ function photos_content(&$a) {
'$can_post' => $can_post,
'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
'$photos' => $photos,
'$page' => $a->pager['page']
));
}

14
view/js/main.js
View file

@ -704,22 +704,26 @@ function updateConvItems(mode,data) {
}
function justifyPhotos(bParam_page) {
function justifyPhotos() {
justifiedGalleryActive = true;
$('#photo-album-contents-' + bParam_page).justifiedGallery({
lastRow : 'nojustify',
$('#photo-album-contents').justifiedGallery({
margins: 3,
sizeRangeSuffixes : {
sizeRangeSuffixes: {
'lt100': '-2',
'lt240': '-2',
'lt320': '-2',
'lt500': '-1',
'lt500': '',
'lt640': '-1',
'lt1024': '-0'
}
}).on('jg.complete', function(e){ justifiedGalleryActive = false; });
}
function justifyPhotosAjax() {
justifiedGalleryActive = true;
$('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
}
function notify_popup_loader(notifyType) {
/* notifications template */

8
view/tpl/photos_recent.tpl
View file

@ -3,14 +3,12 @@
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
{{/if}}
<div id="photo-album-contents-{{$page}}">
<div id="photo-album-contents">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}
</div>
<script>justifyPhotos({{$page}});</script>
<div id="page-end"></div>
</div>
<div class="photos-end"></div>
<script>$(document).ready(function() { loadingPage = false;});</script>
<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
<div id="page-spinner"></div>

5
view/tpl/photosajax.tpl
View file

@ -1,7 +1,4 @@
<!-- -->
<div id="photo-album-contents-{{$page}}">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}
</div>
<script>justifyPhotos({{$page}});</script>
<script>justifyPhotosAjax()</script>