diff options
| author | friendica <info@friendica.com> | 2014-09-20 16:22:21 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-20 16:22:21 -0700 |
| commit | 44cb423f21b6a34a138e7ffd2814fdd08788cfbe (patch) | |
| tree | bbd84e79b59b3e6ccd848758a65aeae9033d37fa /view/tpl | |
| parent | 8d23a8da8dd7326d6ce9c3a64f96e5325a09d4a1 (diff) | |
| parent | a1773fea2529e6e3b1dcc816e948dacb4a250705 (diff) | |
| download | volse-hubzilla-44cb423f21b6a34a138e7ffd2814fdd08788cfbe.tar.gz volse-hubzilla-44cb423f21b6a34a138e7ffd2814fdd08788cfbe.tar.bz2 volse-hubzilla-44cb423f21b6a34a138e7ffd2814fdd08788cfbe.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/photosajax.tpl | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 0f86a635d..fce518cfe 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -3,14 +3,12 @@ <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> {{/if}} -<div id="photo-album-contents-{{$page}}"> +<div id="photo-album-contents"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} - -</div> -<script>justifyPhotos({{$page}});</script> <div id="page-end"></div> +</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> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index a9a9605d0..632aab2b3 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,7 +1,4 @@ -<!-- --> -<div id="photo-album-contents-{{$page}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} -</div> -<script>justifyPhotos({{$page}});</script> +<script>justifyPhotosAjax()</script> |