mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:35:12 +00:00
update jg to latest preview release and try once more to really justify the whole gallery
This commit is contained in:
parent
1c56442818
commit
9feb619bea
5 changed files with 671 additions and 605 deletions
File diff suppressed because it is too large
Load diff
|
@ -703,7 +703,7 @@ function photos_content(&$a) {
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$twist = 'rotright';
|
$twist = 'rotright';
|
||||||
$o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
|
$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) {
|
foreach($r as $rr) {
|
||||||
|
|
||||||
|
@ -758,20 +758,15 @@ function photos_content(&$a) {
|
||||||
echo $ajaxout;
|
echo $ajaxout;
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '<div id="photo-album-contents-' . $a->pager['page'] . '">';
|
|
||||||
echo $ajaxout;
|
echo $ajaxout;
|
||||||
echo '</div>';
|
echo '<script>justifyPhotosAjax();</script>';
|
||||||
echo '<script>justifyPhotos(' . $a->pager['page'] . ');</script>';
|
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$o .= '</div>'; // photo-album-contents
|
|
||||||
$o .= '<script>justifyPhotos(' . $a->pager['page'] . ');</script>';
|
|
||||||
$o .= '<div id="page-end"></div>';
|
$o .= '<div id="page-end"></div>';
|
||||||
|
$o .= '</div>'; // photo-album-contents
|
||||||
$o .= '<div id="photo-album-end"></div>';
|
$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 .= '<div id="page-spinner"></div>';
|
||||||
// $o .= paginate($a);
|
// $o .= paginate($a);
|
||||||
|
|
||||||
|
@ -1226,7 +1221,6 @@ function photos_content(&$a) {
|
||||||
if($photos) {
|
if($photos) {
|
||||||
$o = replace_macros(get_markup_template('photosajax.tpl'),array(
|
$o = replace_macros(get_markup_template('photosajax.tpl'),array(
|
||||||
'$photos' => $photos,
|
'$photos' => $photos,
|
||||||
'$page' => $a->pager['page']
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -1243,7 +1237,6 @@ function photos_content(&$a) {
|
||||||
'$can_post' => $can_post,
|
'$can_post' => $can_post,
|
||||||
'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
|
'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
|
||||||
'$photos' => $photos,
|
'$photos' => $photos,
|
||||||
'$page' => $a->pager['page']
|
|
||||||
));
|
));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -704,22 +704,26 @@ function updateConvItems(mode,data) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function justifyPhotos(bParam_page) {
|
function justifyPhotos() {
|
||||||
justifiedGalleryActive = true;
|
justifiedGalleryActive = true;
|
||||||
$('#photo-album-contents-' + bParam_page).justifiedGallery({
|
$('#photo-album-contents').justifiedGallery({
|
||||||
lastRow : 'nojustify',
|
|
||||||
margins: 3,
|
margins: 3,
|
||||||
sizeRangeSuffixes : {
|
sizeRangeSuffixes: {
|
||||||
'lt100': '-2',
|
'lt100': '-2',
|
||||||
'lt240': '-2',
|
'lt240': '-2',
|
||||||
'lt320': '-2',
|
'lt320': '-2',
|
||||||
'lt500': '-1',
|
'lt500': '',
|
||||||
'lt640': '-1',
|
'lt640': '-1',
|
||||||
'lt1024': '-0'
|
'lt1024': '-0'
|
||||||
}
|
}
|
||||||
}).on('jg.complete', function(e){ justifiedGalleryActive = false; });
|
}).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) {
|
function notify_popup_loader(notifyType) {
|
||||||
|
|
||||||
/* notifications template */
|
/* notifications template */
|
||||||
|
|
|
@ -3,14 +3,12 @@
|
||||||
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
|
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
<div id="photo-album-contents-{{$page}}">
|
<div id="photo-album-contents">
|
||||||
{{foreach $photos as $photo}}
|
{{foreach $photos as $photo}}
|
||||||
{{include file="photo_top.tpl"}}
|
{{include file="photo_top.tpl"}}
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
|
|
||||||
</div>
|
|
||||||
<script>justifyPhotos({{$page}});</script>
|
|
||||||
<div id="page-end"></div>
|
<div id="page-end"></div>
|
||||||
|
</div>
|
||||||
<div class="photos-end"></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>
|
<div id="page-spinner"></div>
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
<!-- -->
|
|
||||||
<div id="photo-album-contents-{{$page}}">
|
|
||||||
{{foreach $photos as $photo}}
|
{{foreach $photos as $photo}}
|
||||||
{{include file="photo_top.tpl"}}
|
{{include file="photo_top.tpl"}}
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
</div>
|
<script>justifyPhotosAjax()</script>
|
||||||
<script>justifyPhotos({{$page}});</script>
|
|
||||||
|
|
Loading…
Reference in a new issue