diff options
author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-11-24 14:19:22 +0100 |
---|---|---|
committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-11-24 14:19:22 +0100 |
commit | bef8879cb1356b880279c6104fcffb0752414a7c (patch) | |
tree | ce3733df7ca168f4afe7e963dc81b6f00944c34c /view/tpl/photo_album.tpl | |
parent | 1cb45c30e9032794b7827738cc28f7728ac28677 (diff) | |
parent | 5b7124f0daeca4aa619f6411ee373d9ff5a22b7b (diff) | |
download | volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.gz volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.bz2 volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.zip |
Merge pull request #7 from friendica/master
Merge from main project
Diffstat (limited to 'view/tpl/photo_album.tpl')
-rwxr-xr-x | view/tpl/photo_album.tpl | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 0a26fc367..5506b01f2 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,17 +1,21 @@ <div class="section-title-wrapper"> - <div class="btn-group btn-group-xs pull-right"> - {{if $album_edit.1}} - <i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper');"></i> - {{/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> {{$upload.0}}</a> - {{/if}} + <div class="pull-right"> + <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> + <div class="btn-group btn-group"> + {{if $album_edit.1}} + <i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i> + {{/if}} + {{if $can_post}} + <button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i> {{$upload.0}}</button> + {{/if}} + </div> </div> + <h2>{{$album}}</h2> <div class="clear"></div> </div> +{{$upload_form}} {{$album_edit.1}} <div id="photo-album-contents" class="generic-content-wrapper"> {{foreach $photos as $photo}} |