diff options
| author | friendica <info@friendica.com> | 2014-09-27 00:15:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-27 00:15:43 -0700 |
| commit | 51c0904a8a32aba3f866d043f00d1b3934de9d94 (patch) | |
| tree | 8e2a48b44caf5d0ab0aab9831fda7612822390d0 /view/tpl | |
| parent | fa019791fa4cd3f5ae4d3b0cf7b8cbef6483f6d6 (diff) | |
| parent | 04e460c8f8915be3b7911bf0b9c9c0bcd8703e25 (diff) | |
| download | volse-hubzilla-51c0904a8a32aba3f866d043f00d1b3934de9d94.tar.gz volse-hubzilla-51c0904a8a32aba3f866d043f00d1b3934de9d94.tar.bz2 volse-hubzilla-51c0904a8a32aba3f866d043f00d1b3934de9d94.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 27 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 16 |
2 files changed, 21 insertions, 22 deletions
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 7ff4a8cc0..5602f8571 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,15 +1,16 @@ <div id="side-bar-photos-albums" class="widget"> -<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3> -{{if $albums}} -<ul> -{{foreach $albums as $al}} -{{if $al.text}} -<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a> ({{$al.total}})</li> -{{/if}} -{{/foreach}} -</ul> -{{/if}} -{{if $upload}} -<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div> -{{/if}} + <h3>{{$title}}</h3> + <ul class="nav nav-pills nav-stacked"> + {{if $upload}} + <li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li> + {{/if}} + {{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> + {{/if}} + {{/foreach}} + + {{/if}} + </ul> </div> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index fce518cfe..b4094512c 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,13 +1,11 @@ -<h3>{{$title}}</h3> -{{if $can_post}} -<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> -{{/if}} - +<div class="section-title-wrapper"> + <h3>{{$title}}</h3> +</div> <div id="photo-album-contents"> -{{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} -{{/foreach}} -<div id="page-end"></div> + {{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> |