diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php index d57f7130f9..1d5cde87b4 100644 --- a/src/Content/Widget/VCard.php +++ b/src/Content/Widget/VCard.php @@ -68,6 +68,8 @@ class VCard $follow_link = ''; $unfollow_link = ''; $wallmessage_link = ''; + $mention_label = ''; + $mention_link = ''; $showgroup_link = ''; $photo = Contact::getPhoto($contact); @@ -102,15 +104,13 @@ class VCard } if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) { - $mention_label = DI::l10n()->t('Post to group'); - $mention_url = 'compose/0?body=!' . $contact['addr']; - $showgroup_label = DI::l10n()->t('View group'); - $showgroup_url = 'network/group/' . $id; + $mention_label = DI::l10n()->t('Post to group'); + $mention_link = 'compose/0?body=!' . $contact['addr']; + $showgroup_link = 'network/group/' . $id; } else { $mention_label = DI::l10n()->t('Mention'); - $mention_url = 'compose/0?body=@' . $contact['addr']; + $mention_link = 'compose/0?body=@' . $contact['addr']; } - } return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [ @@ -131,8 +131,10 @@ class VCard '$unfollow_link' => $unfollow_link, '$wallmessage' => DI::l10n()->t('Message'), '$wallmessage_link' => $wallmessage_link, - '$mention' => [$mention_label, $mention_url], - '$showgroup' => [$showgroup_label, $showgroup_url] + '$mention' => $mention_label, + '$mention_link' => $mention_link, + '$showgroup' => DI::l10n()->t('View group'), + '$showgroup_link' => $showgroup_link, ]); } } diff --git a/view/templates/widget/vcard.tpl b/view/templates/widget/vcard.tpl index 9e38eebfc5..2656be487e 100644 --- a/view/templates/widget/vcard.tpl +++ b/view/templates/widget/vcard.tpl @@ -41,6 +41,12 @@ {{if $wallmessage_link}}
  • {{$wallmessage}}
  • {{/if}} + {{if $mention_link}} +
  • {{$mention}}
  • + {{/if}} + {{if $showgroup_link}} +
  • {{$showgroup}}
  • + {{/if}} diff --git a/view/theme/frio/templates/widget/vcard.tpl b/view/theme/frio/templates/widget/vcard.tpl index 814dec49ed..9f030a8ef0 100644 --- a/view/theme/frio/templates/widget/vcard.tpl +++ b/view/theme/frio/templates/widget/vcard.tpl @@ -56,22 +56,22 @@ {{/if}} - {{if $contact.addr}} + {{if $mention_link}} - {{/if}} - {{if $contact.forum==1 || $contact.prv==1}} + {{/if}} + {{if $showgroup_link}}
    -
    - {{/if}} + {{/if}}