1
0
Fork 0

Move /viewcontacts to /profile/{nickname}/contacts[/{type}]

- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
This commit is contained in:
Hypolite Petovan 2019-05-18 11:47:39 -04:00
commit 709eba6ce3
11 changed files with 186 additions and 136 deletions

View file

@ -894,7 +894,7 @@ class Profile
[
'label' => L10n::t('Status'),
'url' => $url,
'sel' => !$tab && $a->argv[0] == 'profile' ? 'active' : '',
'sel' => !$tab && $a->argv[0] == 'profile' && (empty($a->argv[2]) || $a->argv[2] !== 'contacts') ? 'active' : '',
'title' => L10n::t('Status Messages and Posts'),
'id' => 'status-tab',
'accesskey' => 'm',
@ -969,11 +969,11 @@ class Profile
];
}
if (!$is_owner && empty($a->profile['hide-friends'])) {
if ($is_owner || empty($a->profile['hide-friends'])) {
$tabs[] = [
'label' => L10n::t('Contacts'),
'url' => System::baseUrl() . '/viewcontacts/' . $nickname,
'sel' => !$tab && $a->argv[0] == 'viewcontacts' ? 'active' : '',
'url' => System::baseUrl() . '/profile/' . $nickname . '/contacts',
'sel' => !$tab && !empty($a->argv[2]) && $a->argv[2] == 'contacts' ? 'active' : '',
'title' => L10n::t('Contacts'),
'id' => 'viewcontacts-tab',
'accesskey' => 'k',