diff options
author | friendica <info@friendica.com> | 2014-10-27 16:20:59 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-10-27 16:20:59 -0700 |
commit | 1b53d1c1d32072c71451cfd1a49b89ecfcd8b615 (patch) | |
tree | e3b4b241db991403bc8b057f29f88729ad163c47 /view/tpl/photo_view.tpl | |
parent | 583b445bc02c988e808742b16196e0d80391b3cc (diff) | |
parent | d192bcad65852bb9225a368d1bf42b8918ae6022 (diff) | |
download | volse-hubzilla-1b53d1c1d32072c71451cfd1a49b89ecfcd8b615.tar.gz volse-hubzilla-1b53d1c1d32072c71451cfd1a49b89ecfcd8b615.tar.bz2 volse-hubzilla-1b53d1c1d32072c71451cfd1a49b89ecfcd8b615.zip |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/tpl/photo_view.tpl')
-rwxr-xr-x | view/tpl/photo_view.tpl | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 5e3518c9f..786145691 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -31,7 +31,7 @@ <div class="clear"></div> </div> - <div id="photo-edit-edit" style="display: none;"> + <div id="photo-edit-edit"> <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form"> <input type="hidden" name="item_id" value="{{$edit.item_id}}"> <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label> @@ -155,7 +155,6 @@ </div> {{/if}} - {{if $likebuttons}} <div class="photo-item-tools-right btn-group pull-right"> <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false"> @@ -167,23 +166,22 @@ </div> <div id="like-rotator-{{$id}}" class="like-rotator pull-right"></div> {{/if}} - <div class="clear"></div> - </div> - + <div class="clear"></div> + </div> -</div> + </div> -{{$comments}} + {{$comments}} -{{if $commentbox}} -<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > - {{$commentbox}} -</div> -{{/if}} + {{if $commentbox}} + <div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" > + {{$commentbox}} + </div> + {{/if}} -<div class="clear"></div> + <div class="clear"></div> </div> |