diff options
| author | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
| commit | 31376de0665091f2dba04755562ccd238d57a13c (patch) | |
| tree | ae59c8697b9fd20c33aeaf8acb3a698b63e9657b /view/tpl/photo_album.tpl | |
| parent | c854f8c238da2df08b52249142ad24ef66e422d1 (diff) | |
| parent | 50c16c394fe2d966c62d30930600212a4e33303e (diff) | |
| download | volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.gz volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.bz2 volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/tpl/photo_album.tpl')
| -rwxr-xr-x | view/tpl/photo_album.tpl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 0c878b950..2c0b8e5b9 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,17 +1,19 @@ <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 $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> + <button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> {{/if}} </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}} {{include file="photo_top.tpl"}} |