Merge remote-tracking branch 'friendika/master'

diff --combined mod/notifications.php
index 52ce90e149ad7c7f9ba90e622b2df6ce92bdb011,6c3e67cb42a717b95a9f9267db5844fd7b90edcd..9761a944d7a4d1125f9bf4df9738852388e56549
--- 1/mod/notifications.php
--- 2/mod/notifications.php
+++ b/mod/notifications.php
@@@ -62,28 -62,46 +62,46 @@@ 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
                        $sql_extra = " AND `ignore` = 0 ";
                
-               
+               $notif_tpl = get_markup_template('notifications.tpl');
                
                $notif_content .= '<a href="' . ((strlen($sql_extra)) ? 'notifications/intros/all' : 'notifications/intros' ) . '" id="notifications-show-hide-link" >'
                        . ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '</a></div>' . "\r\n";
@@@ -175,19 -193,20 +193,21 @@@
                        }
                }
                else
-                       $notif_content .= t('<p>No notifications.</p>');
-                       
-               $tabs['intros']['sel']='active';
+                       info( t('No notifications.') . EOL);
+               
                $o .= replace_macros($notif_tpl,array(
+                       '$notif_header' => t('Notifications'),
+                       '$tabs' => $tab_content,
                        '$notif_content' => $notif_content,
-                       '$tabs' => $tabs,
+                       '$activetab' => 'intros'
                ));
                
                $o .= paginate($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`, 
                                `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, 
@@@ -262,14 -281,16 +282,16 @@@
                        $notif_content = t('Nothing new!');
                }
                
-               $tabs['net']['sel']='active';
                $o .= replace_macros($notif_tpl,array(
+                       '$notif_header' => t('Notifications'),
+                       '$tabs' => $tab_content,
                        '$notif_content' => $notif_content,
-                       '$tabs' => $tabs,
+                       '$activetab' => 'network'
                ));
                
        } else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
                
+               $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`, 
@@@ -337,10 -358,11 +359,11 @@@
                        $notif_content = t('Nothing new!');
                }
                
-               $tabs['home']['sel'] = 'active';
                $o .= replace_macros($notif_tpl,array(
+                       '$notif_header' => t('Notifications'),
+                       '$tabs' => $tab_content,
                        '$notif_content' => $notif_content,
-                       '$tabs' => $tabs,
+                       '$activetab' => 'home'
                ));
        }