aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-10-02 21:04:50 +0200
committermarijus <mario@mariovavti.com>2014-10-02 21:04:50 +0200
commitdf70c2c9b62365c9b0feb8a482aef1ac626fabd6 (patch)
tree65eced380be60f8d89939052635aa5ae7f27e5d6 /view/tpl
parenta932c20dc419784518be0a03b697ee6b9322f455 (diff)
downloadvolse-hubzilla-df70c2c9b62365c9b0feb8a482aef1ac626fabd6.tar.gz
volse-hubzilla-df70c2c9b62365c9b0feb8a482aef1ac626fabd6.tar.bz2
volse-hubzilla-df70c2c9b62365c9b0feb8a482aef1ac626fabd6.zip
more work on photos
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/photo_album.tpl26
-rwxr-xr-xview/tpl/photo_top.tpl2
2 files changed, 24 insertions, 4 deletions
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index b5ea14c14..d23f7e817 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,3 +1,23 @@
-<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="section-title-wrapper">
+ <div class="btn-group btn-group-xs pull-right">
+ {{if $edit}}
+ <a class="btn btn-default" href="{{$edit.1}}" title="{{$edit.0}}"><i class="icon-pencil"></i></a>
+ {{/if}}
+ <a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
+ {{if $can_post}}
+ <a class="btn btn-xs btn-success" href="{{$upload.1}}"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</a>
+ {{/if}}
+ </div>
+ <h2>{{$album}}</h2>
+
+ <div class="clear"></div>
+</div>
+<div id="photo-album-contents">
+ {{foreach $photos as $photo}}
+ {{include file="photo_top.tpl"}}
+ {{/foreach}}
+ <div id="page-end"></div>
+</div>
+<div class="photos-end"></div>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
+<div id="page-spinner"></div>
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
index 4a106c30d..ee21e5cce 100755
--- a/view/tpl/photo_top.tpl
+++ b/view/tpl/photo_top.tpl
@@ -1,4 +1,4 @@
<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}}" />
+ <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{else}}{{$photo.alt}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
</a>