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/photos_recent.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/photos_recent.tpl')
-rwxr-xr-x | view/tpl/photos_recent.tpl | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 7727abcea..15faa4a34 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,16 +1,18 @@ -<div class="section-title-wrapper"> - {{if $can_post}} - <button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> - {{/if}} - <h2>{{$title}}</h2> - <div class="clear"></div> -</div> -{{$upload_form}} -<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="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $can_post}} + <button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + {{$upload_form}} + <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> |