common tabs to notifications and mail

4 files changed, 63 insertions, 34 deletions

diff --git a/mod/message.php b/mod/message.php
index d4772d026..39aa0479f 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -45,21 +45,32 @@ function message_content(&$a) {
 
 	$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
-	if (($a->argc > 1) && ($a->argv[1] === 'new')) {
-		$tab = 'new';
-	} else if ($a->argc == 2 && $a->argv[1] === 'sent') {
-		$tab = 'sent';
-	} else {
-		$tab = 'inbox';
-	}
-	
+
+	$tabs = array(
+		array(
+			'label' => t('Inbox'),
+			'url'=> $a->get_baseurl() . '/message',
+			'sel'=> (($a->argc == 1) ? 'active' : ''),
+		),
+		array(
+			'label' => t('Outbox'),
+			'url' => $a->get_baseurl() . '/message/sent',
+			'sel'=> (($a->argv[1] == 'sent') ? 'active' : ''),
+		),
+		array(
+			'label' => t('New Message'),
+			'url' => $a->get_baseurl() . '/message/new',
+			'sel'=> (($a->argv[1] == 'new') ? 'active' : ''),
+		),
+	);
+	$tpl = get_markup_template('common_tabs.tpl');
+	$tab_content = replace_macros($tpl, array('$tabs'=>$tabs));
+
+
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, array(
 		'$messages' => t('Messages'),
-		'$inbox' => t('Inbox'),
-		'$outbox' => t('Outbox'),
-		'$new' => t('New Message'),
-		'$activetab' => $tab
+		'$tab_content' => $tab_content
 	));
 
 
diff --git a/mod/notifications.php b/mod/notifications.php
index 6d78ea024..6c3e67cb4 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`, 
@@ -252,6 +282,8 @@ function notifications_content(&$a) {
 		}
 		
 		$o .= replace_macros($notif_tpl,array(
+			'$notif_header' => t('Notifications'),
+			'$tabs' => $tab_content,
 			'$notif_content' => $notif_content,
 			'$activetab' => 'network'
 		));
@@ -327,6 +359,8 @@ function notifications_content(&$a) {
 		}
 		
 		$o .= replace_macros($notif_tpl,array(
+			'$notif_header' => t('Notifications'),
+			'$tabs' => $tab_content,
 			'$notif_content' => $notif_content,
 			'$activetab' => 'home'
 		));
diff --git a/view/mail_head.tpl b/view/mail_head.tpl
index 2aeb3006e..afb65f537 100644
--- a/view/mail_head.tpl
+++ b/view/mail_head.tpl
@@ -1,10 +1,3 @@
 <h3>$messages</h3>
 
-<div class="message-links">
-<ul>
-<li><a href="message" class="button message-link-inbox">$inbox</a></li>
-<li><a href="message/sent" class="button message-link-outbox">$outbox</a></li>
-<li><a href="message/new" class="button message-link-new">$new</a></li>
-</ul>
-</div>
-<div class="message-links-end"></div>
+$tab_content
diff --git a/view/notifications.tpl b/view/notifications.tpl
index 24f78f37e..d737a7507 100644
--- a/view/notifications.tpl
+++ b/view/notifications.tpl
@@ -1,14 +1,5 @@
-
-<h1>Notifications</h1>
-
-<p id="notification-listing-desc">
-	<a href="/notifications/network" class="button tabs {{if $activetab==network}}active{{endif}}">Network</a>
-	<a href="/notifications/home" class="button tabs {{if $activetab==home}}active{{endif}}">Home</a>
-	<a href="/notifications/intros" class="button tabs {{if $activetab==intros}}active{{endif}}">Introductions</a>
-	<a href="/message" class="button tabs">Messages</a>
-</p>
-<div class="notification-listing-end"></div>
-
+<h1>$notif_header</h1>
+$tabs
 <div class="notif-network-wrapper">
 	$notif_content
 </div>