diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-26 12:49:02 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-26 12:49:02 -0800 |
| commit | 6126070a1d53c3ef4f59c8a0a6160610ef16563c (patch) | |
| tree | 2ffd507342edfa4db3ee516d6b7468597bef37cf /view | |
| parent | 459166116d926df23c73a839f3c87c2cfd2ba4ab (diff) | |
| parent | 776bc51172f5c21348c674a8bb6bf5037bde6815 (diff) | |
| download | volse-hubzilla-6126070a1d53c3ef4f59c8a0a6160610ef16563c.tar.gz volse-hubzilla-6126070a1d53c3ef4f59c8a0a6160610ef16563c.tar.bz2 volse-hubzilla-6126070a1d53c3ef4f59c8a0a6160610ef16563c.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/photo_drop.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/photo_item.tpl | 39 |
2 files changed, 24 insertions, 18 deletions
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl index 31b654374..24aff0209 100755 --- a/view/tpl/photo_drop.tpl +++ b/view/tpl/photo_drop.tpl @@ -1,4 +1,3 @@ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" > - <a href="item/drop/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></a> + <a class="btn btn-default btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="icon-trash"></i></a> </div> -<div class="wall-item-delete-end"></div> diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index 2ea7aa9f3..ec643c4a9 100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -1,27 +1,34 @@ -<div class="wall-item-outside-wrapper {{$indent}}" id="wall-item-outside-wrapper-{{$id}}" > - <div class="wall-item-content-wrapper {{$indent}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;"> - <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > - <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > - <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> - <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> +<div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" > + <div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;"> + <div class="wall-item-head"> + <div class="wall-item-info" id="wall-item-info-{{$id}}" > + <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> + <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> + </div> </div> - </div> - <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > - <div class="wall-item-author"> - <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a> + <div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" > + <div class="wall-item-author"> + <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a> + </div> + <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> </div> - <div class="wall-item-ago" id="wall-item-ago-{{$id}}">{{$ago}}</div> </div> <div class="wall-item-content" id="wall-item-content-{{$id}}" > <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div> <div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div> - </div> - {{$drop}} - <div class="wall-item-wrapper-end"></div> + </div> + {{if $drop}} + <div class="wall-item-tools" id="wall-item-tools-{{$id}}" > + <div class="wall-item-tools-right pull-right"> + {{$drop}} + </div> + <div class="clear"></div> + </div> + {{/if}} + <div class="clear"></div> {{$comment}} - - <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> |