mirror of
https://github.com/friendica/friendica
synced 2024-11-18 02:23:40 +00:00
add mention-/showgroup button also to profile/vcard.tpl
update translations
This commit is contained in:
parent
02b26f5969
commit
c6af5266cd
3 changed files with 29 additions and 10 deletions
|
@ -1198,20 +1198,16 @@ class Contact
|
||||||
$pm_url = 'message/new/' . $contact['id'];
|
$pm_url = 'message/new/' . $contact['id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
|
|
||||||
$mention_label = DI::l10n()->t('Post to group');
|
|
||||||
$mention_url = 'compose/0?body=!' . $contact['addr'];
|
|
||||||
} else {
|
|
||||||
$mention_label = DI::l10n()->t('Mention');
|
|
||||||
$mention_url = 'compose/0?body=@' . $contact['addr'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$contact_url = 'contact/' . $contact['id'];
|
$contact_url = 'contact/' . $contact['id'];
|
||||||
|
|
||||||
if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
|
if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
|
||||||
|
$mention_label = DI::l10n()->t('Post to group');
|
||||||
|
$mention_url = 'compose/0?body=!' . $contact['addr'];
|
||||||
$network_label = DI::l10n()->t('View group');
|
$network_label = DI::l10n()->t('View group');
|
||||||
$network_url = 'network/group/' . $contact['id'];
|
$network_url = 'network/group/' . $contact['id'];
|
||||||
} else {
|
} else {
|
||||||
|
$mention_label = DI::l10n()->t('Mention');
|
||||||
|
$mention_url = 'compose/0?body=@' . $contact['addr'];
|
||||||
$network_label = DI::l10n()->t('Network Posts');
|
$network_label = DI::l10n()->t('Network Posts');
|
||||||
$network_url = 'contact/' . $contact['id'] . '/conversations';
|
$network_url = 'contact/' . $contact['id'] . '/conversations';
|
||||||
}
|
}
|
||||||
|
|
|
@ -453,6 +453,18 @@ class Profile
|
||||||
Logger::warning('Missing hidewall key in profile array', ['profile' => $profile, 'callstack' => System::callstack(10)]);
|
Logger::warning('Missing hidewall key in profile array', ['profile' => $profile, 'callstack' => System::callstack(10)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($profile['account-type'] == Contact::TYPE_COMMUNITY) {
|
||||||
|
$mention_label = DI::l10n()->t('Post to group');
|
||||||
|
$mention_url = 'compose/0?body=!' . $profile['addr'];
|
||||||
|
$network_label = DI::l10n()->t('View group');
|
||||||
|
$network_url = 'network/group/' . $profile['id'];
|
||||||
|
} else {
|
||||||
|
$mention_label = DI::l10n()->t('Mention');
|
||||||
|
$mention_url = 'compose/0?body=@' . $profile['addr'];
|
||||||
|
$network_label = DI::l10n()->t('Network Posts');
|
||||||
|
$network_url = 'contact/' . $profile['id'] . '/conversations';
|
||||||
|
}
|
||||||
|
|
||||||
$tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');
|
$tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');
|
||||||
$o .= Renderer::replaceMacros($tpl, [
|
$o .= Renderer::replaceMacros($tpl, [
|
||||||
'$profile' => $p,
|
'$profile' => $p,
|
||||||
|
@ -476,6 +488,10 @@ class Profile
|
||||||
'$updated' => $updated,
|
'$updated' => $updated,
|
||||||
'$diaspora' => $diaspora,
|
'$diaspora' => $diaspora,
|
||||||
'$contact_block' => $contact_block,
|
'$contact_block' => $contact_block,
|
||||||
|
'$mention_label' => $mention_label,
|
||||||
|
'$mention_url' => $mention_url,
|
||||||
|
'$network_label' => $network_label,
|
||||||
|
'$network_url' => $network_url,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$arr = ['profile' => &$profile, 'entry' => &$o];
|
$arr = ['profile' => &$profile, 'entry' => &$o];
|
||||||
|
|
|
@ -72,9 +72,16 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{if $profile.addr}}
|
{{if $profile.addr}}
|
||||||
<div id="mention-link-button">
|
<div id="mention-link-button">
|
||||||
<button type="button" id="mention-link" class="btn btn-labeled btn-primary" onclick="openWallMessage('compose/0?body={{if $profile.forum==1}}!{{else}}@{{/if}}{{$profile.addr}}')">
|
<button type="button" id="mention-link" class="btn btn-labeled btn-primary" onclick="openWallMessage('{{$mention_url}}')">
|
||||||
<span class=""><i class="fa fa-pencil-square-o"></i></span>
|
<span class=""><i class="fa fa-pencil-square-o"></i></span>
|
||||||
<span class="">{{$mention}}</span>
|
<span class="">{{$mention_label}}</span>
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
|
{{if $network_label}}
|
||||||
|
<div id="showgroup-button">
|
||||||
|
<button type="button" id="showgroup" class="btn btn-labeled btn-primary" onclick="window.location.href=('{{$network_url}}')">
|
||||||
|
<span class=""><i class="fa fa-group"></i></span>
|
||||||
|
<span class="">{{$network_label}}</span>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue