diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-21 16:20:50 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-21 16:20:50 -0700 |
| commit | 992f8272d38b9ee73cc9facbe473665713f6ff2d (patch) | |
| tree | 7f9b8e747c4694651bad51632345e6fa440258a4 /include | |
| parent | 89d21c08735ad9bb151acee5ee1f372a803e2213 (diff) | |
| parent | 27678a523c4c02bf4e3b31bf4ac01413feaf3759 (diff) | |
| download | volse-hubzilla-992f8272d38b9ee73cc9facbe473665713f6ff2d.tar.gz volse-hubzilla-992f8272d38b9ee73cc9facbe473665713f6ff2d.tar.bz2 volse-hubzilla-992f8272d38b9ee73cc9facbe473665713f6ff2d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/nav.php | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/include/nav.php b/include/nav.php index b0533e4c7..f6c8aa23f 100644 --- a/include/nav.php +++ b/include/nav.php @@ -101,12 +101,12 @@ EOT; $nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn']; // user menu - $nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'),'profile_nav_btn']; + $nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((\App::$nav_sel['active'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn']; if(feature_enabled(local_channel(),'multi_profiles')) - $nav['usermenu'][] = ['profiles', t('Edit Profiles'),"", t('Manage/Edit profiles'),'profiles_nav_btn']; + $nav['usermenu'][] = ['profiles', t('Edit Profiles'), ((\App::$nav_sel['active'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn']; else - $nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'),"", t('Edit your profile'),'profiles_nav_btn']; + $nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((\App::$nav_sel['active'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn']; } else { @@ -290,21 +290,7 @@ EOT; * */ function nav_set_selected($item){ - App::$nav_sel = array( - 'community' => null, - 'network' => null, - 'home' => null, - 'profiles' => null, - 'intros' => null, - 'notifications' => null, - 'messages' => null, - 'directory' => null, - 'settings' => null, - 'contacts' => null, - 'manage' => null, - 'register' => null, - ); - App::$nav_sel[$item] = 'active'; + App::$nav_sel['active'] = $item; } |