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

Normalize template variables in Widget\VCard 

- Display new links in vier
- Address https://github.com/friendica/friendica/issues/13157#issuecomment-1751750581
This commit is contained in:
Hypolite Petovan 2023-10-07 22:06:47 -04:00
parent 2c297da755
commit c31c264b0b
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Content/Widget/VCard.php
View File

@ -68,6 +68,8 @@ class VCard
$follow_link = ''; $follow_link = '';
$unfollow_link = ''; $unfollow_link = '';
$wallmessage_link = ''; $wallmessage_link = '';
$mention_label = '';
$mention_link = '';
$showgroup_link = ''; $showgroup_link = '';
$photo = Contact::getPhoto($contact); $photo = Contact::getPhoto($contact);
@ -102,15 +104,13 @@ class VCard
} }
if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) { if ($contact['contact-type'] == Contact::TYPE_COMMUNITY) {
$mention_label = DI::l10n()->t('Post to group'); $mention_label = DI::l10n()->t('Post to group');
$mention_url = 'compose/0?body=!' . $contact['addr']; $mention_link = 'compose/0?body=!' . $contact['addr'];
$showgroup_label = DI::l10n()->t('View group'); $showgroup_link = 'network/group/' . $id;
$showgroup_url = 'network/group/' . $id;
} else { } else {
$mention_label = DI::l10n()->t('Mention'); $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'), [ return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
@ -131,8 +131,10 @@ class VCard
'$unfollow_link' => $unfollow_link, '$unfollow_link' => $unfollow_link,
'$wallmessage' => DI::l10n()->t('Message'), '$wallmessage' => DI::l10n()->t('Message'),
'$wallmessage_link' => $wallmessage_link, '$wallmessage_link' => $wallmessage_link,
'$mention' => [$mention_label, $mention_url], '$mention' => $mention_label,
'$showgroup' => [$showgroup_label, $showgroup_url] '$mention_link' => $mention_link,
'$showgroup' => DI::l10n()->t('View group'),
'$showgroup_link' => $showgroup_link,
]); ]);
} }
} }

6
view/templates/widget/vcard.tpl
View File

@ -41,6 +41,12 @@
{{if $wallmessage_link}} {{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li> <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}} {{/if}}
{{if $mention_link}}
<li><a id="mention-link" href="{{$mention_link}}">{{$mention}}</a></li>
{{/if}}
{{if $showgroup_link}}
<li><a id="showgroup-link" href="{{$showgroup_link}}">{{$showgroup}}</a></li>
{{/if}}
</ul> </ul>
</div> </div>

16
view/theme/frio/templates/widget/vcard.tpl
View File

@ -56,22 +56,22 @@
</button> </button>
</div> </div>
{{/if}} {{/if}}
{{if $contact.addr}} {{if $mention_link}}
<div id="mention-link-button"> <div id="mention-link-button">
<button type="button" id="mention-link" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="openWallMessage('{{$mention.1}}')" titel="{{$mention.0}}" aria-label="{{$mention.0}}"> <button type="button" id="mention-link" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="openWallMessage('{{$mention_link}}')" title="{{$mention}}" aria-label="{{$mention}}">
<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.0}}</span> <span class="">{{$mention}}</span>
</button> </button>
</div> </div>
{{/if}} {{/if}}
{{if $contact.forum==1 || $contact.prv==1}} {{if $showgroup_link}}
<div id="show-group-button"> <div id="show-group-button">
<button type="button" id="show-group" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="window.location.href='{{$showgroup.1}}'"> <button type="button" id="show-group" class="btn btn-labeled btn-primary{{if !$always_open_compose}} modal-open{{/if}}" onclick="window.location.href='{{$showgroup_link}}'" title="{{$showgroup}}" aria-label="{{$showgroup}}">
<span class=""><i class="fa fa-group"></i></span> <span class=""><i class="fa fa-group"></i></span>
<span class="">{{$showgroup.0}}</span> <span class="">{{$showgroup}}</span>
</button> </button>
</div> </div>
{{/if}} {{/if}}
</div> </div>
<div class="clear"></div> <div class="clear"></div>