nav: fix "See all notifications"

diff --git a/include/nav.php b/include/nav.php
index 36a3edd2a2ce1dd11be7cbeb89a683655288c5bb..95dd37ba6c3aa5f238ee8ff88086aa3e304b535a 100755 (executable)
--- 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 a156dbadd157a001838bcdfcceed8123f1db0da4..4cb278ee8766ed7fc4f65a0e3dbe733b12499501 100755 (executable)
--- 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 9831260b308bbc2f844c61c9847e3847010e5343..a5d8459874fb7ca243dcc0d56e454bfba838c90b 100755 (executable)
--- 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 bb4da22cb3f3729b75f0099afe6ef423e55d432d..acbea5bf84f3a0669e1b82fbde18faf80393a31a 100755 (executable)
--- 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>