diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-07 16:15:52 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-07 16:15:52 -0800 |
| commit | 241607e7d73d9bdbbae253b73de91c3847c6df76 (patch) | |
| tree | cc62b12c3d8599d0c63d9c4ed05e8284f18b5815 /view/tpl | |
| parent | bd7d851758e9fdedade6458049a8fbc799da6eba (diff) | |
| parent | 96d94551f92aeca5efdee6286e7950229c46f201 (diff) | |
| download | volse-hubzilla-241607e7d73d9bdbbae253b73de91c3847c6df76.tar.gz volse-hubzilla-241607e7d73d9bdbbae253b73de91c3847c6df76.tar.bz2 volse-hubzilla-241607e7d73d9bdbbae253b73de91c3847c6df76.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl')
| -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 |
3 files changed, 5 insertions, 5 deletions
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> |