diff options
| author | redmatrix <git@macgirvin.com> | 2016-01-15 11:59:38 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-01-15 11:59:38 -0800 |
| commit | f66c6bfebfd48274c9b29cd62b1fac933c6530e4 (patch) | |
| tree | 9dcdfd91f93d1b2b5aec00a734a797bd1955c79f /view/tpl/connection_template.tpl | |
| parent | fe77ab4d71ed86d8c29a43ae2bc579a0db8b84b1 (diff) | |
| parent | 2498df68c716ec6ed80b5547c721ca9741a85572 (diff) | |
| download | volse-hubzilla-f66c6bfebfd48274c9b29cd62b1fac933c6530e4.tar.gz volse-hubzilla-f66c6bfebfd48274c9b29cd62b1fac933c6530e4.tar.bz2 volse-hubzilla-f66c6bfebfd48274c9b29cd62b1fac933c6530e4.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl/connection_template.tpl')
| -rwxr-xr-x | view/tpl/connection_template.tpl | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 9813b83e2..143989971 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -1,8 +1,15 @@ <div id="contact-entry-wrapper-{{$contact.id}}"> <div class="section-subtitle-wrapper"> <div class="pull-right"> + {{if $contact.approve}} + <form action="connedit/{{$contact.id}}" method="post" > + <button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button> + {{/if}} <a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a> - <a href="{{$contact.link}}" class="btn btn-success btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i> {{$contact.edit}}</a> + <a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a> + {{if $contact.approve}} + </form> + {{/if}} </div> <h3>{{if $contact.public_forum}}<i class="icon-comments-alt"></i> {{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3> </div> @@ -21,6 +28,16 @@ <span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span> </div> {{/if}} + {{if $contact.webbie}} + <div class="contact-info-element"> + <span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}} + </div> + {{/if}} + {{if $contact.network}} + <div class="contact-info-element"> + <span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a> + </div> + {{/if}} </div> </div> |