clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8306 from annando/contact-unfollow-delete 

Don't show "delete contact" when there is a follow or unfollow option
This commit is contained in:
Hypolite Petovan 2020-02-19 11:44:49 -05:00 committed by GitHub
parent abe1e37dd9 f8670b6268
commit 858b63656e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Contact.php
View File

@ -1278,6 +1278,10 @@ class Contact
}
}
if (!empty($follow_link) || !empty($unfollow_link)) {
$contact_drop_link = '';
}
/**
* Menu array:
* "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]

5
view/theme/frio/templates/contact_template.tpl
View File

@ -73,6 +73,11 @@
<i class="fa fa-user-plus" aria-hidden="true"></i>
</a>
{{/if}}
{{if $contact.photo_menu.unfollow}}
<a class="contact-action-link btn-link" href="{{$contact.photo_menu.unfollow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.unfollow.0}}">
<i class="fa fa-user-times" aria-hidden="true"></i>
</a>
{{/if}}
{{if $contact.photo_menu.hide}}
<a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}">
<i class="fa fa-times" aria-hidden="true"></i>