solve intro/notify naming issue by providing both or either, theme decides what to do

diff --git a/include/nav.php b/include/nav.php
index 600043ee58f36bc6243ae43b66360956096b1f4e..5c24df51e20558b7f12425105b8f3848f8b75f55 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -114,7 +114,9 @@ function nav(&$a) {
                /* only show friend requests for normal pages. Other page types have automatic friendship. */
 
                if($_SESSION['page_flags'] == PAGE_NORMAL) {
-                       $nav['notifications'] = array('notifications/network',  t('Notifications'), "", t('Notifications'));
+                       $nav['introductions'] = array('notifications/intros',   t('Introductions'), "", t('Friend Requests'));
+                       $nav['notifications'] = array('notifications',  t('Notifications'), "", t('Notifications'));
+
                }
 
                $nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
@@ -175,6 +177,7 @@ function nav_set_selected($item){
                'network'               => null,
                'home'                  => null,
                'profiles'              => null,
+               'introductions' => null,
                'notifications' => null,
                'messages'              => null,
                'directory'     => null,

diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
index b13ea9ae2eaf52daf42135936520e0c994b499c6..afa9180651df4f00d05e2c7f04b199c55bdeb216 100644 (file)
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@@ -30,8 +30,8 @@
        {{ if $nav.community }}
        <a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
        {{ endif }}
-       {{ if $nav.notifications }}
-       <a id="nav-notify-link" class="nav-commlink $nav.notifications.2 $sel.notifications" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+       {{ if $nav.introductions }}
+       <a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
        <span id="intro-update" class="nav-ajax-left"></span>
        {{ endif }}
        {{ if $nav.messages }}