diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-12-07 12:13:51 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-12-07 12:13:51 +0100 |
| commit | 69c9f4588c57a1159ab18c5987f99ea5471579d5 (patch) | |
| tree | 7988e6d787fae50ba68e220c3e80665f33274b62 | |
| parent | 53627c89a716fcd9bac535169710e65b229e96a5 (diff) | |
| download | volse-hubzilla-69c9f4588c57a1159ab18c5987f99ea5471579d5.tar.gz volse-hubzilla-69c9f4588c57a1159ab18c5987f99ea5471579d5.tar.bz2 volse-hubzilla-69c9f4588c57a1159ab18c5987f99ea5471579d5.zip | |
make justify gallery work with more than one albums per page (eg album widget)
| -rw-r--r-- | include/widgets.php | 1 | ||||
| -rw-r--r-- | mod/photos.php | 2 | ||||
| -rw-r--r-- | view/js/main.js | 8 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photosajax.tpl | 2 |
6 files changed, 12 insertions, 9 deletions
diff --git a/include/widgets.php b/include/widgets.php index 89836f90c..bdb4cfa69 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1338,6 +1338,7 @@ function widget_album($args) { $o .= replace_macros($tpl, array( '$photos' => $photos, '$album' => (($title) ? $title : $album), + '$album_id' => rand(), '$album_edit' => array(t('Edit Album'), $album_edit), '$can_post' => false, '$upload' => array(t('Upload'), z_root() . '/photos/' . get_app()->profile['channel_address'] . '/upload/' . bin2hex($album)), diff --git a/mod/photos.php b/mod/photos.php index 33a895fdf..5a55123cc 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -779,6 +779,7 @@ function photos_content(&$a) { $o .= replace_macros($tpl, array( '$photos' => $photos, '$album' => $album, + '$album_id' => rand(), '$album_edit' => array(t('Edit Album'), $album_edit), '$can_post' => $can_post, '$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'); $o .= replace_macros($tpl, array( '$title' => t('Recent Photos'), + '$album_id' => rand(), '$can_post' => $can_post, '$upload' => array(t('Upload'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), '$photos' => $photos, diff --git a/view/js/main.js b/view/js/main.js index ca7d50b90..d670b704a 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -758,9 +758,9 @@ function pageUpdate() { }); } -function justifyPhotos() { +function justifyPhotos(id) { justifiedGalleryActive = true; - $('#photo-album-contents').justifiedGallery({ + $('#' + id).justifiedGallery({ selector: '> a, > div:not(.spinner, #page-end)', margins: 3, border: 0, @@ -775,9 +775,9 @@ function justifyPhotos() { }).on('jg.complete', function(e){ justifiedGalleryActive = false; }); } -function justifyPhotosAjax() { +function justifyPhotosAjax(id) { 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) { diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index bbcdcefc1..95169164a 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -21,7 +21,7 @@ {{$upload_form}} {{$album_edit.1}} <div class="section-content-wrapper-np"> - <div id="photo-album-contents"> + <div id="photo-album-contents-{{$album_id}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} @@ -30,5 +30,5 @@ </div> </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> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 46ac65e87..f3131117c 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -8,7 +8,7 @@ </div> {{$upload_form}} <div class="section-content-wrapper-np"> - <div id="photo-album-contents"> + <div id="photo-album-contents-{{$album_id}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} @@ -17,5 +17,5 @@ </div> </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> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index 705cb6c75..45191db85 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,4 +1,4 @@ {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} -<script>justifyPhotosAjax()</script> +<script>justifyPhotosAjax('photo-album-contents-{{$album_id}}')</script> |