diff options
| author | friendica <info@friendica.com> | 2014-09-10 16:09:01 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-10 16:09:01 -0700 |
| commit | 08638f3ec88e86def618ff89bdedb9ae9696d218 (patch) | |
| tree | b17fcb8222f44c7a901dd961d0d9b6746c09362e /view/tpl | |
| parent | eae146d85d6479cae26129577870963faa2802f6 (diff) | |
| download | volse-hubzilla-08638f3ec88e86def618ff89bdedb9ae9696d218.tar.gz volse-hubzilla-08638f3ec88e86def618ff89bdedb9ae9696d218.tar.bz2 volse-hubzilla-08638f3ec88e86def618ff89bdedb9ae9696d218.zip | |
Revert "Merge pull request #583 from git-marijus/master"
autoload broken - even after clearing cache and retrying.
This reverts commit 13e7a8f123b283a096af302b0366255355ba8439, reversing
changes made to 4712b78e520ca10b34e3e9b99c2752b10d811b42.
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 | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index b5ea14c14..a63bff78c 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,3 +1,7 @@ -<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> +<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> diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 4a106c30d..944928f85 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,4 +1,7 @@ -<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> +<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> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 8eaa208b1..386979de5 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -3,7 +3,7 @@ <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> {{/if}} -<div id="photo-album-contents"> +<div id="photo-album-contents" class="photos"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} |