diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-27 11:24:02 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-27 11:24:02 +0100 |
| commit | cf5383fdbe273af6b3858e216b313124fd125cf6 (patch) | |
| tree | a220d55b6624c76421a6173aec785958103aa92a /view | |
| parent | 21f2df399d3e21b6322ece16717efe88bcc21621 (diff) | |
| parent | 6126070a1d53c3ef4f59c8a0a6160610ef16563c (diff) | |
| download | volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.tar.gz volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.tar.bz2 volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/events_cal-js.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/photo_drop.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/photo_item.tpl | 39 | ||||
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 3 |
4 files changed, 28 insertions, 18 deletions
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl index b3c7ff03b..bc8a3aa31 100755 --- a/view/tpl/events_cal-js.tpl +++ b/view/tpl/events_cal-js.tpl @@ -1,3 +1,4 @@ +{{$tabs}} <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> 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> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index a027a7c2e..780626cf9 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -12,6 +12,9 @@ <i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i> </button> {{/if}} + {{if $edit}} + <a href="{{$edit.link}}" class="btn btn-primary btn-xs"><i class="icon-pencil"></i> {{$edit.label}}</a> + {{/if}} </div> <h2>{{$title}}</h2> <div class="clear"></div> |