harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another day another concept - hope this works better

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mod/photos.php
View File

@ -635,7 +635,7 @@ function photos_content(&$a) {
); );
if(count($r)) { if(count($r)) {
$a->set_pager_total(count($r)); $a->set_pager_total(count($r));
$a->set_pager_itemspage(60); $a->set_pager_itemspage(30);
} }
if($_GET['order'] === 'posted') if($_GET['order'] === 'posted')
@ -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">'; $o .= '<div id="photo-album-contents-' . $a->pager['page'] . '">';
foreach($r as $rr) { foreach($r as $rr) {
@ -755,12 +755,18 @@ function photos_content(&$a) {
if($_REQUEST['aj']) { if($_REQUEST['aj']) {
if(! $r) if(! $r)
$ajaxout .= '<div id="content-complete"></div>'; $ajaxout .= '<div id="content-complete"></div>';
echo '<div id="photo-album-contents-' . $a->pager['page'] . '">';
echo $ajaxout; echo $ajaxout;
echo '<div>';
echo '<script>justifyPhotos(' . $a->pager['page'] . ');</script>';
killme(); killme();
} }
$o .= '<div id="page-end"></div>';
$o .= '</div>'; // photo-album-contents $o .= '</div>'; // photo-album-contents
$o .= '<script>justifyPhotos(' . $a->pager['page'] . ');</script>';
$o .= '<div id="page-end"></div>';
$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;});</script>';
$o .= '<div id="page-spinner"></div>'; $o .= '<div id="page-spinner"></div>';
@ -1159,7 +1165,7 @@ function photos_content(&$a) {
); );
if(count($r)) { if(count($r)) {
$a->set_pager_total(count($r)); $a->set_pager_total(count($r));
$a->set_pager_itemspage(60); $a->set_pager_itemspage(30);
} }
$r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` $r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo`
@ -1216,7 +1222,8 @@ function photos_content(&$a) {
if($_REQUEST['aj']) { if($_REQUEST['aj']) {
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 {
@ -1233,6 +1240,7 @@ 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']
)); ));
} }
@ -1243,7 +1251,7 @@ function photos_content(&$a) {
killme(); killme();
} }
// $o .= paginate($a); // paginate($a);
return $o; return $o;
} }

4
view/css/mod_photos.css
View File

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

12
view/js/main.js
View File

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

6
view/tpl/photos_recent.tpl
View File

@ -3,12 +3,14 @@
<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"> <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 id="page-end"></div>
</div> </div>
<script>justifyPhotos({{$page}});</script>
<div id="page-end"></div>
<div class="photos-end"></div> <div class="photos-end"></div>
<script>$(document).ready(function() { loadingPage = false;});</script> <script>$(document).ready(function() { loadingPage = false;});</script>
<div id="page-spinner"></div> <div id="page-spinner"></div>

3
view/tpl/photosajax.tpl
View File

@ -1,4 +1,7 @@
<!-- --> <!-- -->
<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>justifyPhotos({{$page}});</script>