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 | |
| 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')
| -rwxr-xr-x | view/tpl/album_edit.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/photo_top.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 24 |
4 files changed, 16 insertions, 17 deletions
diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index 61653c47c..84a47378b 100755 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -3,7 +3,7 @@ <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label> -<input type="text" size="64" name="albumname" value="{{$album}}" > +<input type="text" name="albumname" value="{{$album}}" > <div id="photo-album-edit-name-end"></div> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 0c878b950..0a26fc367 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,7 +1,7 @@ <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}} @@ -12,6 +12,7 @@ <div class="clear"></div> </div> +{{$album_edit.1}} <div id="photo-album-contents" class="generic-content-wrapper"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index ee21e5cce..a86aa7f80 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,4 +1,4 @@ <a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> - <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{else}}{{$photo.alt}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> + <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> </a> 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> |