Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index 36a3edd2a2ce1dd11be7cbeb89a683655288c5bb..511ca07fc0079ef41736260f964bd3883adbcee6 100755 (executable)
--- 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 system notifications seen'), '','');
 
                }
 
@@ -148,7 +149,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');