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

make justify gallery work with more than one albums per page (eg album widget)

Browse Source
This commit is contained in:
Mario Vavti 2015-12-07 12:13:51 +01:00
parent 53627c89a7
commit 69c9f4588c
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/widgets.php
View File

@ -1338,6 +1338,7 @@ function widget_album($args) {
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$photos' => $photos, '$photos' => $photos,
'$album' => (($title) ? $title : $album), '$album' => (($title) ? $title : $album),
'$album_id' => rand(),
'$album_edit' => array(t('Edit Album'), $album_edit), '$album_edit' => array(t('Edit Album'), $album_edit),
'$can_post' => false, '$can_post' => false,
'$upload' => array(t('Upload'), z_root() . '/photos/' . get_app()->profile['channel_address'] . '/upload/' . bin2hex($album)), '$upload' => array(t('Upload'), z_root() . '/photos/' . get_app()->profile['channel_address'] . '/upload/' . bin2hex($album)),

2
mod/photos.php
View File

@ -779,6 +779,7 @@ function photos_content(&$a) {
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$photos' => $photos, '$photos' => $photos,
'$album' => $album, '$album' => $album,
'$album_id' => rand(),
'$album_edit' => array(t('Edit Album'), $album_edit), '$album_edit' => array(t('Edit Album'), $album_edit),
'$can_post' => $can_post, '$can_post' => $can_post,
'$upload' => array(t('Upload'), $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album)), '$upload' => array(t('Upload'), $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album)),
@ -1313,6 +1314,7 @@ function photos_content(&$a) {
$tpl = get_markup_template('photos_recent.tpl'); $tpl = get_markup_template('photos_recent.tpl');
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$title' => t('Recent Photos'), '$title' => t('Recent Photos'),
'$album_id' => rand(),
'$can_post' => $can_post, '$can_post' => $can_post,
'$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), '$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
'$photos' => $photos, '$photos' => $photos,

8
view/js/main.js
View File

@ -758,9 +758,9 @@ function pageUpdate() {
}); });
} }
function justifyPhotos() { function justifyPhotos(id) {
justifiedGalleryActive = true; justifiedGalleryActive = true;
$('#photo-album-contents').justifiedGallery({ $('#' + id).justifiedGallery({
selector: '> a, > div:not(.spinner, #page-end)', selector: '> a, > div:not(.spinner, #page-end)',
margins: 3, margins: 3,
border: 0, border: 0,
@ -775,9 +775,9 @@ function justifyPhotos() {
}).on('jg.complete', function(e){ justifiedGalleryActive = false; }); }).on('jg.complete', function(e){ justifiedGalleryActive = false; });
} }
function justifyPhotosAjax() { function justifyPhotosAjax(id) {
justifiedGalleryActive = true; justifiedGalleryActive = true;
$('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; }); $('#' + id).justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
} }
function notify_popup_loader(notifyType) { function notify_popup_loader(notifyType) {

4
view/tpl/photo_album.tpl
View File

@ -21,7 +21,7 @@
{{$upload_form}} {{$upload_form}}
{{$album_edit.1}} {{$album_edit.1}}
<div class="section-content-wrapper-np"> <div class="section-content-wrapper-np">
<div id="photo-album-contents"> <div id="photo-album-contents-{{$album_id}}">
{{foreach $photos as $photo}} {{foreach $photos as $photo}}
{{include file="photo_top.tpl"}} {{include file="photo_top.tpl"}}
{{/foreach}} {{/foreach}}
@ -30,5 +30,5 @@
</div> </div>
</div> </div>
<div class="photos-end"></div> <div class="photos-end"></div>
<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> <script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
<div id="page-spinner"></div> <div id="page-spinner"></div>

4
view/tpl/photos_recent.tpl
View File

@ -8,7 +8,7 @@
</div> </div>
{{$upload_form}} {{$upload_form}}
<div class="section-content-wrapper-np"> <div class="section-content-wrapper-np">
<div id="photo-album-contents"> <div id="photo-album-contents-{{$album_id}}">
{{foreach $photos as $photo}} {{foreach $photos as $photo}}
{{include file="photo_top.tpl"}} {{include file="photo_top.tpl"}}
{{/foreach}} {{/foreach}}
@ -17,5 +17,5 @@
</div> </div>
</div> </div>
<div class="photos-end"></div> <div class="photos-end"></div>
<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> <script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
<div id="page-spinner"></div> <div id="page-spinner"></div>

2
view/tpl/photosajax.tpl
View File

@ -1,4 +1,4 @@
{{foreach $photos as $photo}} {{foreach $photos as $photo}}
{{include file="photo_top.tpl"}} {{include file="photo_top.tpl"}}
{{/foreach}} {{/foreach}}
<script>justifyPhotosAjax()</script> <script>justifyPhotosAjax('photo-album-contents-{{$album_id}}')</script>