From 9047840ec2a124f8bf9c9263c42579e78a9f6516 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 23 Jan 2012 09:23:37 +0100
Subject: [PATCH] nav: fix "See all notifications"

---
 include/nav.php               | 2 +-
 js/main.js                    | 3 ++-
 view/nav.tpl                  | 2 +-
 view/theme/testbubble/nav.tpl | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/nav.php b/include/nav.php
index 36a3edd2a2..95dd37ba6c 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -116,7 +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', "", ""));
+			$nav['notifications']['all']=array('notifications/network', t('See all notifications', "", ""));
 
 		}
 
diff --git a/js/main.js b/js/main.js
index a156dbadd1..4cb278ee87 100755
--- a/js/main.js
+++ b/js/main.js
@@ -88,6 +88,7 @@
 
 		/* notifications template */
 		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
+		var notifications_all = unescape($('<div>').append( $("#nav-notifications-see-all").clone() ).html()); //outerHtml hack
 		var notifications_empty = unescape($("#nav-notifications-menu").html());
 		
 		/* nav update event  */
@@ -116,7 +117,7 @@
 				$("#nav-notifications-linkmenu").addClass("on");
 				nnm = $("#nav-notifications-menu");
 				
-				nnm.html("<li><a href='"+baseurl+"/notifications/network'>Show All Notifications</a></li>");
+				nnm.html(notifications_all);
 				
 				//nnm.attr('popup','true');
 				eNotif.children("note").each(function(){
diff --git a/view/nav.tpl b/view/nav.tpl
index 9831260b30..a5d8459874 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="$nav.notifications_all.0">$nav.notifications_all.1</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 bb4da22cb3..acbea5bf84 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="$nav.notifications_all.0">$nav.notifications_all.1</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