aboutsummaryrefslogtreecommitdiffstats
path: root/include/nav.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-09 15:15:02 -0700
committerzotlabs <mike@macgirvin.com>2017-10-09 15:15:02 -0700
commitd636ff586d5f7e8d86a05a1e391b4501eb5f29f2 (patch)
tree729734bfc3c662b36c4a0a4e1735f5ce87eb2aba /include/nav.php
parent623dfa13845e34c85eae2a66c6aa855c3e059c38 (diff)
parentcc1ffff7cdfe5881636b6d2de3fe16f0094b5d69 (diff)
downloadvolse-hubzilla-d636ff586d5f7e8d86a05a1e391b4501eb5f29f2.tar.gz
volse-hubzilla-d636ff586d5f7e8d86a05a1e391b4501eb5f29f2.tar.bz2
volse-hubzilla-d636ff586d5f7e8d86a05a1e391b4501eb5f29f2.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include/nav.php')
-rw-r--r--include/nav.php26
1 files changed, 19 insertions, 7 deletions
diff --git a/include/nav.php b/include/nav.php
index 718e7befa..44026e1e9 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -103,12 +103,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'), ((\App::$nav_sel['active'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn'];
+ $nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((\App::$nav_sel['name'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn'];
if(feature_enabled(local_channel(),'multi_profiles'))
- $nav['usermenu'][] = ['profiles', t('Edit Profiles'), ((\App::$nav_sel['active'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn'];
+ $nav['usermenu'][] = ['profiles', t('Edit Profiles'), ((\App::$nav_sel['name'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn'];
else
- $nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((\App::$nav_sel['active'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn'];
+ $nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((\App::$nav_sel['name'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn'];
}
else {
@@ -233,6 +233,15 @@ EOT;
// turned off until somebody discovers this and figures out a good location for it.
$powered_by = '';
+ $active_app = q("SELECT app_url FROM app WHERE app_channel = %d AND app_name = '%s' LIMIT 1",
+ intval($channel['channel_id']),
+ dbesc(\App::$nav_sel['raw_name'])
+ );
+
+ if($active_app) {
+ $url = $active_app[0]['app_url'];
+ }
+
//app bin
if($is_owner) {
if(get_pconfig(local_channel(), 'system','initial_import_system_apps') === false) {
@@ -258,7 +267,7 @@ EOT;
$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
foreach($syslist as $app) {
- if(\App::$nav_sel['active'] == $app['name'])
+ if(\App::$nav_sel['name'] == $app['name'])
$app['active'] = true;
if($is_owner) {
@@ -297,7 +306,7 @@ EOT;
'$userinfo' => $x['usermenu'],
'$localuser' => local_channel(),
'$is_owner' => $is_owner,
- '$sel' => App::$nav_sel,
+ '$sel' => App::$nav_sel,
'$powered_by' => $powered_by,
'$help' => t('@name, #tag, ?doc, content'),
'$pleasewait' => t('Please wait...'),
@@ -309,7 +318,7 @@ EOT;
'$addapps' => t('Add Apps'),
'$orderapps' => t('Arrange Apps'),
'$sysapps_toggle' => t('Toggle System Apps'),
- '$loc' => $myident
+ '$url' => $url
));
if(x($_SESSION, 'reload_avatar') && $observer) {
@@ -332,7 +341,10 @@ EOT;
*
*/
function nav_set_selected($item){
- App::$nav_sel['active'] = $item;
+ App::$nav_sel['raw_name'] = $item;
+ $item = ['name' => $item];
+ Zlib\Apps::translate_system_apps($item);
+ App::$nav_sel['name'] = $item['name'];
}