From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 17 Oct 2011 14:37:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'friendika/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2116943964e0c10984976f6d38eba044e35f983a;p=friendica.git

Merge remote-tracking branch 'friendika/master'
---

2116943964e0c10984976f6d38eba044e35f983a
diff --cc mod/notifications.php
index 52ce90e149,6c3e67cb42..9761a944d7
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@@ -62,22 -62,40 +62,40 @@@ function notifications_content(&$a) 
  		notice( t('Permission denied.') . EOL);
  		return;
  	}
- 	
- 	$notif_tpl = get_markup_template('notifications.tpl');
- 	
+ 
+ 	nav_set_selected('notifications');		
+ 
+ 	$o = '';
  	$tabs = array(
- 		'net' 	=> array('label' => t('Network'), 'url'=>$a->get_baseurl().'/notifications/network', 'sel'=>''),
- 		'home' 	=> array('label' => t('Home'), 'url'=>$a->get_baseurl().'/notifications/home', 'sel'=>''),
- 		'intros'=> array('label' => t('Introductions'), 'url'=>$a->get_baseurl().'/notifications/intros', 'sel'=>''),
- 		'msg'	=> array('label' => t('Messages'), 'url'=>$a->get_baseurl().'/message', 'sel'=>''),
+ 		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 = '';
+ 	$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
@@@ -187,7 -206,7 +206,8 @@@
  		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`, 
  				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,