diff options
| author | RedMatrix <info@friendica.com> | 2014-09-11 18:45:22 +1000 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2014-09-11 18:45:22 +1000 |
| commit | 46fd0ef5ba206c1504f353617b31904b8f173e82 (patch) | |
| tree | 311afb757625dcdb813bda529fb4eb86791e1701 /view/tpl | |
| parent | 8bf4b5e7768c13d89e8080aeb7baef38b09b5ca8 (diff) | |
| parent | 3caee72aee3d5008f954e3ccf1dc2b61fedf23d8 (diff) | |
| download | volse-hubzilla-46fd0ef5ba206c1504f353617b31904b8f173e82.tar.gz volse-hubzilla-46fd0ef5ba206c1504f353617b31904b8f173e82.tar.bz2 volse-hubzilla-46fd0ef5ba206c1504f353617b31904b8f173e82.zip | |
Merge pull request #587 from git-marijus/master
try once more :)
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/photo_album.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/photo_top.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/photosajax.tpl | 3 |
4 files changed, 13 insertions, 15 deletions
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index a63bff78c..b5ea14c14 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,7 +1,3 @@ -<div class="photo-album-image-wrapper{{$twist}}" id="photo-album-image-wrapper-{{$id}}"> - <a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}"> - <img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize" id="photo-album-photo-{{$id}}" /> - <p class='caption'>{{$desc}}</p> - </a> -</div> -<div class="photo-album-image-wrapper-end"></div> +<a href="{{$photolink}}" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}"> + <img src="{{$imgsrc}}" alt="{{if $desc}}{{$desc}}{{else}}{{$imgalt}}{{/if}}" title="{{$phototitle}}" id="photo-album-photo-{{$id}}" /> +</a> diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 944928f85..4a106c30d 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,7 +1,4 @@ -<div class="photo-top-image-wrapper lframe {{$photo.twist}}" id="photo-top-image-wrapper-{{$photo.id}}"> - <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> - <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$photo.id}}" /> - </a> - <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div> -</div> +<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> + <img src="{{$photo.src}}" alt="{{$photo.album.name}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> +</a> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 386979de5..0f86a635d 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -3,12 +3,14 @@ <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> {{/if}} -<div id="photo-album-contents" class="photos"> +<div id="photo-album-contents-{{$page}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} -<div id="page-end"></div> + </div> +<script>justifyPhotos({{$page}});</script> +<div id="page-end"></div> <div class="photos-end"></div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner"></div> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index a88682e8b..a9a9605d0 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,4 +1,7 @@ <!-- --> +<div id="photo-album-contents-{{$page}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} +</div> +<script>justifyPhotos({{$page}});</script> |