remove obsolete notifications

This commit is contained in:
friendica 2013-07-21 17:45:36 -07:00
parent 2455b0c92f
commit 19f674c29d
2 changed files with 17 additions and 19 deletions

View File

@ -70,30 +70,31 @@ function notifications_content(&$a) {
nav_set_selected('notifications'); nav_set_selected('notifications');
$o = ''; $o = '';
$tabs = array( $tabs = array(
array( array(
'label' => t('System'), 'label' => t('System'),
'url'=>$a->get_baseurl(true) . '/notifications/system', 'url'=>$a->get_baseurl(true) . '/notifications/system',
'sel'=> (($a->argv[1] == 'system') ? 'active' : ''), 'sel'=> (($a->argv[1] == 'system') ? 'active' : ''),
), ),
array( // array(
'label' => t('Network'), // 'label' => t('Network'),
'url'=>$a->get_baseurl(true) . '/notifications/network', // 'url'=>$a->get_baseurl(true) . '/notifications/network',
'sel'=> (($a->argv[1] == 'network') ? 'active' : ''), // 'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
), // ),
array( array(
'label' => t('Personal'), 'label' => t('Personal'),
'url'=>$a->get_baseurl(true) . '/notifications/personal', 'url'=>$a->get_baseurl(true) . '/notifications/personal',
'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''), 'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''),
), ),
array( // array(
'label' => t('Home'), // 'label' => t('Home'),
'url' => $a->get_baseurl(true) . '/notifications/home', // 'url' => $a->get_baseurl(true) . '/notifications/home',
'sel'=> (($a->argv[1] == 'home') ? 'active' : ''), // 'sel'=> (($a->argv[1] == 'home') ? 'active' : ''),
), // ),
array( array(
'label' => t('Introductions'), 'label' => t('Introductions'),
'url' => $a->get_baseurl(true) . '/notifications/intros', 'url' => $a->get_baseurl(true) . '/connections/pending',
'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''), 'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''),
), ),
array( array(
@ -105,6 +106,7 @@ function notifications_content(&$a) {
$o = ""; $o = "";
//Disabled
if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
nav_set_selected('introductions'); nav_set_selected('introductions');
@ -221,7 +223,9 @@ function notifications_content(&$a) {
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} else if (($a->argc > 1) && ($a->argv[1] == 'network')) { }
elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
$notif_tpl = get_markup_template('notifications.tpl'); $notif_tpl = get_markup_template('notifications.tpl');
@ -430,10 +434,6 @@ function notifications_content(&$a) {
)); ));
} else if (($a->argc > 1) && ($a->argv[1] == 'home')) { } else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
$notif_tpl = get_markup_template('notifications.tpl'); $notif_tpl = get_markup_template('notifications.tpl');

View File

@ -1,7 +1,5 @@
<h1>{{$notif_header}}</h1> <h1>{{$notif_header}}</h1>
{{include file="common_tabs.tpl"}}
<div class="notif-network-wrapper"> <div class="notif-network-wrapper">
{{$notif_content}} {{$notif_content}}
</div> </div>