From 3ef6344d4172c8aef7c4f895d4c1122f676bbece Mon Sep 17 00:00:00 2001
From: "Abinoam P. Marques Jr" <abinoam@gmail.com>
Date: Sun, 19 Feb 2012 15:35:34 -0300
Subject: include/nav.php - Friendika -> Friendica

---
 include/nav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/nav.php')

diff --git a/include/nav.php b/include/nav.php
index 95dd37ba6..c8a44af80 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -148,7 +148,7 @@ function nav(&$a) {
 	$banner = get_config('system','banner');
 
 	if($banner === false) 
-		$banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
+		$banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
 
 
 	$tpl = get_markup_template('nav.tpl');
-- 
cgit v1.2.3


From 41636a50aa4fd3f53ad9f9e9d797bfcc37ba8e13 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 22 Feb 2012 23:34:30 -0800
Subject: new notify sort of working in testbubble

---
 include/nav.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/nav.php')

diff --git a/include/nav.php b/include/nav.php
index c8a44af80..6fee7adb2 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -116,7 +116,8 @@ function nav(&$a) {
 		if($_SESSION['page_flags'] == PAGE_NORMAL) {
 			$nav['introductions'] = array('notifications/intros',	t('Introductions'), "", t('Friend Requests'));
 			$nav['notifications'] = array('notifications',	t('Notifications'), "", t('Notifications'));
-			$nav['notifications']['all']=array('notifications/network', t('See all notifications', "", ""));
+			$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
+			$nav['notifications']['mark'] = array('', t('Mark all notifications seen'), '','');
 
 		}
 
-- 
cgit v1.2.3


From fd43e2c563679a98ad31e1a09a05bef6bb448677 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 23 Feb 2012 00:28:26 -0800
Subject: more theme notify fixes

---
 include/nav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/nav.php')

diff --git a/include/nav.php b/include/nav.php
index 6fee7adb2..511ca07fc 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -117,7 +117,7 @@ function nav(&$a) {
 			$nav['introductions'] = array('notifications/intros',	t('Introductions'), "", t('Friend Requests'));
 			$nav['notifications'] = array('notifications',	t('Notifications'), "", t('Notifications'));
 			$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
-			$nav['notifications']['mark'] = array('', t('Mark all notifications seen'), '','');
+			$nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '','');
 
 		}
 
-- 
cgit v1.2.3