Add missing $nav_sel in class App

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index d4cb4101b0dcae2fb41bbc2230ba556f94fba943..3fee2b140acfac3e5e7c985869885e0f595a4c11 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -63,10 +63,37 @@ function notifications_content(&$a) {
                return;
        }
 
+       nav_set_selected('notifications');              
+
        $o = '';
+       $tabs = array(
+               array(
+                       'label' => t('Network'),
+                       'url'=>$a->get_baseurl() . '/notifications/network',
+                       'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
+               ),
+               array(
+                       'label' => t('Home'),
+                       'url' => $a->get_baseurl() . '/notifications/home',
+                       'sel'=> (($a->argv[1] == 'home') ? 'active' : ''),
+               ),
+               array(
+                       'label' => t('Introductions'),
+                       'url' => $a->get_baseurl() . '/notifications/intros',
+                       'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''),
+               ),
+               array(
+                       'label' => t('Messages'),
+                       'url' => $a->get_baseurl() . '/message',
+                       'sel'=> '',
+               ),
+       );
+       
+       $o = "";
+
        
        if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
-               
+               nav_set_selected('introductions');
                if(($a->argc > 2) && ($a->argv[2] == 'all'))
                        $sql_extra = '';
                else
@@ -167,8 +194,9 @@ function notifications_content(&$a) {
                        info( t('No notifications.') . EOL);
                
                $o .= replace_macros($notif_tpl,array(
+                       '$notif_header' => t('Notifications'),
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
-                       '$activetab' => 'intros'
                ));
                
                $o .= paginate($a);
@@ -191,6 +219,7 @@ function notifications_content(&$a) {
                $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl');
                $tpl_item_friends = get_markup_template('notifications_friends_item.tpl');
                $tpl_item_comments = get_markup_template('notifications_comments_item.tpl');
+               $tpl_item_posts = get_markup_template('notifications_posts_item.tpl');
                
                $notif_content = '';
                
@@ -205,17 +234,17 @@ function notifications_content(&$a) {
                                                        '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
                                                ));
-
                                                break;
+                                               
                                        case ACTIVITY_DISLIKE:
                                                $notif_content .= replace_macros($tpl_item_dislikes,array(
                                                        '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
-                                                       '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
+                                                       '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
                                                ));
-
                                                break;
+                                               
                                        case ACTIVITY_FRIEND:
                                        
                                                $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
@@ -225,16 +254,21 @@ function notifications_content(&$a) {
                                                $notif_content .= replace_macros($tpl_item_friends,array(
                                                        '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
-                                                       '$item_text' => sprintf( t("%s is now friend with %s"), $it['author-name'], $it['fname']),
+                                                       '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
                                                        '$item_when' => relative_date($it['created'])
                                                ));
-
                                                break;
+                                               
                                        default:
-                                               $notif_content .= replace_macros($tpl_item_comments,array(
+                                               $item_text = (($it['id'] == $it['parent'])
+                                                       ? sprintf( t("%s created a new post"), $it['author-name'])
+                                                       : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']));
+                                               $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
+
+                                               $notif_content .= replace_macros($tpl,array(
                                                        '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
-                                                       '$item_text' => sprintf( t("%s commented %s's post"), $it['author-name'], $it['pname']),
+                                                       '$item_text' => $item_text,
                                                        '$item_when' => relative_date($it['created'])
                                                ));
                                }
@@ -242,12 +276,13 @@ function notifications_content(&$a) {
                        
                } else {
                        
-                       $notif_content = 'Nothing new!';
+                       $notif_content = t('Nothing new!');
                }
                
                $o .= replace_macros($notif_tpl,array(
+                       '$notif_header' => t('Notifications'),
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
-                       '$activetab' => 'network'
                ));
                
        } else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
@@ -287,7 +322,7 @@ function notifications_content(&$a) {
                                                $notif_content .= replace_macros($tpl_item_dislikes,array(
                                                        '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
-                                                       '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
+                                                       '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
                                                ));
 
@@ -301,7 +336,7 @@ function notifications_content(&$a) {
                                                $notif_content .= replace_macros($tpl_item_friends,array(
                                                        '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
-                                                       '$item_text' => sprintf( t("%s is now friend with %s"), $it['author-name'], $it['fname']),
+                                                       '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
                                                        '$item_when' => relative_date($it['created'])
                                                ));
 
@@ -310,19 +345,20 @@ function notifications_content(&$a) {
                                                $notif_content .= replace_macros($tpl_item_comments,array(
                                                        '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
                                                        '$item_image' => $it['author-avatar'],
-                                                       '$item_text' => sprintf( t("%s commented %s's post"), $it['author-name'], $it['pname']),
+                                                       '$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']),
                                                        '$item_when' => relative_date($it['created'])
                                                ));
                                }
                        }
                                
                } else {
-                       $notif_content = 'Nothing new!';
+                       $notif_content = t('Nothing new!');
                }
                
                $o .= replace_macros($notif_tpl,array(
+                       '$notif_header' => t('Notifications'),
+                       '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
-                       '$activetab' => 'home'
                ));
        }