From 30fcda7576681ff5e311f720a8d3a73ac808ae82 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Sun, 22 Jan 2012 19:27:56 +0100
Subject: [PATCH] nav: fix intro notification url, fix "See all notifications"
 url and make it translatable

---
 include/nav.php               | 1 +
 mod/ping.php                  | 2 +-
 view/nav.tpl                  | 2 +-
 view/theme/testbubble/nav.tpl | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/nav.php b/include/nav.php
index 4c75a495b3..36a3edd2a2 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -116,6 +116,7 @@ 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', "", ""));
 
 		}
 
diff --git a/mod/ping.php b/mod/ping.php
index 35f6c53aef..db68332bd0 100755
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -145,7 +145,7 @@ function ping_init(&$a) {
 		echo '	<notif count="'.$tot.'">';
 		if ($intro>0){
 			foreach ($intros as $i) { 
-				echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
+				echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
 			};
 		}
 		if ($mail>0){
diff --git a/view/nav.tpl b/view/nav.tpl
index d9255d86c7..9831260b30 100755
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -43,7 +43,7 @@
 			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
 				<span id="notify-update" class="nav-notify"></span>
 				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="/notifications/network">See all notifications</a></li>
+					<li id="nav-notifications-see-all"><a href="$nav.notifications_all.0">$nav.notifications_all.1</a></li>
 					<li class="empty">$emptynotifications</li>
 				</ul>
 			</li>		
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index c7d6168263..bb4da22cb3 100755
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -9,7 +9,7 @@
 		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
 		{{ if $nav.messages }}<a rel="#nav-notifications-menu" id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
 		<ul id="nav-notifications-menu" class="menu-popup">
-			<li id="nav-notifications-see-all"><a href="/notifications/network">See all notifications</a></li>
+			<li id="nav-notifications-see-all"><a href="$nav.notifications_all.0">$nav.notifications_all.1</a></li>
 			<li class="empty">$emptynotifications</li>
 		</ul>
 	</div>
-- 
2.39.5