diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-21 20:51:07 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-21 20:51:07 -0700 |
| commit | ae6612025dcd31349056364d0c701bfda58470db (patch) | |
| tree | c67db564af1d2368344205fda2889f336dd14925 /view/tpl/photo_album.tpl | |
| parent | 33c9d8e06b2af512d25b0c9063ce58d86b72f747 (diff) | |
| parent | 0ad71b3efa7de4eb1f4313ffe4562ec83743bdc1 (diff) | |
| download | volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.gz volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.bz2 volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
util/messages.po
Diffstat (limited to 'view/tpl/photo_album.tpl')
| -rwxr-xr-x | view/tpl/photo_album.tpl | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 5506b01f2..0ce9c36a8 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,27 +1,29 @@ -<div class="section-title-wrapper"> - <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 class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <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> - </div> - <h2>{{$album}}</h2> + <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"}} - {{/foreach}} - <div id="page-end"></div> + <div class="clear"></div> + </div> + {{$upload_form}} + {{$album_edit.1}} + <div id="photo-album-contents"> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> + </div> </div> <div class="photos-end"></div> <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> |