X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=6c3e67cb42a717b95a9f9267db5844fd7b90edcd;hb=df7702709b07560af1d469f0835586af317f39b0;hp=083476501abe387c1ca137def7aa00cf99f36b44;hpb=8eedbf30f1da18c7eae8d822293faf8056545e65;p=friendica.git

diff --git a/mod/notifications.php b/mod/notifications.php
index 083476501a..6c3e67cb42 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -63,10 +63,39 @@ 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'=> '',
+		),
+	);
+	$tpl = get_markup_template('common_tabs.tpl');
+	$tab_content = replace_macros($tpl, array('$tabs'=>$tabs));
+
+
+
+
 	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,6 +196,8 @@ function notifications_content(&$a) {
 			info( t('No notifications.') . EOL);
 		
 		$o .= replace_macros($notif_tpl,array(
+			'$notif_header' => t('Notifications'),
+			'$tabs' => $tab_content,
 			'$notif_content' => $notif_content,
 			'$activetab' => 'intros'
 		));
@@ -175,7 +206,6 @@ function notifications_content(&$a) {
 		return $o;
 				
 	} else if (($a->argc > 1) && ($a->argv[1] == 'network')) {
-		
 		$notif_tpl = get_markup_template('notifications.tpl');
 		
 		$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, 
@@ -212,7 +242,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'])
 						));
 						break;
@@ -226,24 +256,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_when' => relative_date($it['created'])
-						));
-						break;
-						
-					case ACTIVITY_POST;$notif_content .= replace_macros($tpl_item_posts,array(
-							'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
-							'$item_image' => $it['author-avatar'],
-							'$item_text' => sprintf( t("%s posted"), $it['author-name']),
+							'$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'])
 						));
 				}
@@ -251,10 +278,12 @@ 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' => $tab_content,
 			'$notif_content' => $notif_content,
 			'$activetab' => 'network'
 		));
@@ -296,7 +325,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'])
 						));
 
@@ -310,7 +339,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'])
 						));
 
@@ -319,17 +348,19 @@ 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' => $tab_content,
 			'$notif_content' => $notif_content,
 			'$activetab' => 'home'
 		));