another day another concept - hope this works better

This commit is contained in:
marijus
2014-09-11 10:41:11 +02:00
parent 8835f646ae
commit 3caee72aee
5 changed files with 40 additions and 29 deletions

View File

@@ -182,3 +182,7 @@
margin-left: 200px;
}
div[id^='photo-album-contents-'] {
margin-bottom: 3px;
}

View File

@@ -700,29 +700,25 @@ function updateConvItems(mode,data) {
updatePageItems(update_mode,data);
$("#page-spinner").spin(false);
in_progress = false;
justifyPhotos();
});
}
function justifyPhotos() {
if($('#photo-album-contents').length > 0) {
loadingPage = true;
$('#photo-album-contents').justifiedGallery({
lastRow : 'nojustify',
captions: true,
margins: 3,
rowHeight : 150,
sizeRangeSuffixes : {
'lt100': '',
'lt240': '',
'lt320': '',
'lt500': '',
'lt640': '',
'lt1024': ''
}
}).on('jg.complete', function(e){ loadingPage = false; });
}
function justifyPhotos(bParam_page) {
$('#photo-album-contents-' + bParam_page).justifiedGallery({
lastRow : 'nojustify',
captions: true,
margins: 3,
rowHeight : 150,
sizeRangeSuffixes : {
'lt100': '',
'lt240': '',
'lt320': '',
'lt500': '',
'lt640': '',
'lt1024': ''
}
});
}
function notify_popup_loader(notifyType) {
@@ -1093,8 +1089,6 @@ $(document).ready(function() {
$(".autotime").timeago();
justifyPhotos();
});
function zFormError(elm,x) {

View File

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

View File

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