diff options
| author | habeascodice <habeascodice@federated.social> | 2014-09-28 19:31:19 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-09-28 19:31:19 -0700 |
| commit | 73ebdff0837a713d8849b713d0cc2fb4701a2c5f (patch) | |
| tree | 7656a07d3eb8d87d12b72cc86559bba157e60343 /view/tpl | |
| parent | c0b59ae36a5ef31b9071edb991f63d4800e21a9d (diff) | |
| parent | e18dfbe3ce0a8d89a5320e4f239801d0b84dd83e (diff) | |
| download | volse-hubzilla-73ebdff0837a713d8849b713d0cc2fb4701a2c5f.tar.gz volse-hubzilla-73ebdff0837a713d8849b713d0cc2fb4701a2c5f.tar.bz2 volse-hubzilla-73ebdff0837a713d8849b713d0cc2fb4701a2c5f.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 5602f8571..0f8b809ac 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -4,10 +4,11 @@ {{if $upload}} <li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li> {{/if}} + <li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li> {{if $albums}} {{foreach $albums as $al}} {{if $al.text}} - <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li> + <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li> {{/if}} {{/foreach}} diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index b4094512c..6b0f555b6 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,5 +1,9 @@ <div class="section-title-wrapper"> - <h3>{{$title}}</h3> + {{if $can_post}} + <a class="btn btn-xs btn-success pull-right" href="{{$upload.1}}"><i class="icon-upload"></i> {{$upload.0}}</a> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> </div> <div id="photo-album-contents"> {{foreach $photos as $photo}} |