aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/photo_album.tpl
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-11-13 13:30:29 -0800
committerhabeascodice <habeascodice@federated.social>2014-11-13 13:30:29 -0800
commit2dbecf95454993cdf4996d2d65463d7759cd479b (patch)
treecbef39a4779efed1c0ab3b61a9ff09e37fadb49e /view/tpl/photo_album.tpl
parentbc02b933727da7a000d43d2d7d495f066616dc81 (diff)
parentac27db22c18ee7a82a52cbadb3efe2760b910499 (diff)
downloadvolse-hubzilla-2dbecf95454993cdf4996d2d65463d7759cd479b.tar.gz
volse-hubzilla-2dbecf95454993cdf4996d2d65463d7759cd479b.tar.bz2
volse-hubzilla-2dbecf95454993cdf4996d2d65463d7759cd479b.zip
Merge branch 'master' of https://github.com/habeascodice/red
Diffstat (limited to 'view/tpl/photo_album.tpl')
-rwxr-xr-xview/tpl/photo_album.tpl20
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>&nbsp;{{$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>&nbsp;{{$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}}