From f99c007187b83755d7b1c80c63fde7c1162a99c4 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 9 Oct 2017 17:49:15 +0200
Subject: new notification changes - use sticky_kit instead of position fixed

---
 include/nav.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'include/nav.php')

diff --git a/include/nav.php b/include/nav.php
index 6b56c9aee..28ca54d07 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 {
@@ -258,7 +258,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)
@@ -291,7 +291,8 @@ EOT;
 		'$addapps' => t('Add Apps'),
 		'$orderapps' => t('Arrange Apps'),
 		'$sysapps_toggle' => t('Toggle System Apps'),
-		'$loc' => $myident
+		'$loc' => $myident,
+		'$url' => ((App::$nav_sel['url']) ? App::$nav_sel['url'] : App::$cmd)
 	));
 
 	if(x($_SESSION, 'reload_avatar') && $observer) {
@@ -314,7 +315,13 @@ EOT;
  * 
  */
 function nav_set_selected($item){
-	App::$nav_sel['active'] = $item;
+	if(is_array($item)) {
+		App::$nav_sel['name'] = $item['name'];
+		App::$nav_sel['url']  = $item['url'];
+	}
+	else {
+		App::$nav_sel['name'] = $item;
+	}
 }
 
 
-- 
cgit v1.2.3


From cc1ffff7cdfe5881636b6d2de3fe16f0094b5d69 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 9 Oct 2017 21:22:57 +0200
Subject: feed untranslated appnames to nav_set_selected() and query for the
 active app directly to get app details

---
 include/nav.php | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'include/nav.php')

diff --git a/include/nav.php b/include/nav.php
index 8736133de..3da67ffd1 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -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) {
@@ -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,8 +318,7 @@ EOT;
 		'$addapps' => t('Add Apps'),
 		'$orderapps' => t('Arrange Apps'),
 		'$sysapps_toggle' => t('Toggle System Apps'),
-		'$loc' => $myident,
-		'$url' => ((App::$nav_sel['url']) ? App::$nav_sel['url'] : App::$cmd)
+		'$url' => $url
 	));
 
 	if(x($_SESSION, 'reload_avatar') && $observer) {
@@ -333,13 +341,10 @@ EOT;
  * 
  */
 function nav_set_selected($item){
-	if(is_array($item)) {
-		App::$nav_sel['name'] = $item['name'];
-		App::$nav_sel['url']  = $item['url'];
-	}
-	else {
-		App::$nav_sel['name'] = $item;
-	}
+	App::$nav_sel['raw_name'] = $item;
+	$item = ['name' => $item];
+	Zlib\Apps::translate_system_apps($item);
+	App::$nav_sel['name'] = $item['name'];
 }
 
 
-- 
cgit v1.2.3