From 4d9d6f1cc22c0ac22425a16d4e8e9231c51fa389 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Wed, 20 Mar 2013 04:13:18 -0700
Subject: [PATCH] Mailout interface cleanup. @Steve - bug remains in prefs
 area.

---
 e107_admin/mailout.php                | 32 +++++++++++++++++----------
 e107_handlers/mailout_admin_class.php | 13 ++++++-----
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index f3a09699d..6aea1d3e3 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -907,22 +907,30 @@ function show_prefs($mailAdmin)
 		</td>
 	</tr>\n";
 
-	if (isset($pref['e_mailout_list']))
-	{  // Allow selection of email address sources
-		$text .= "<tr>
-		<td>".LAN_MAILOUT_77."</td>
-		<td> 
-	  ";
-	  $mail_enable = explode(',',$pref['mailout_enabled']);
-	  foreach ($pref['e_mailout_list'] as $mailer => $v)	  {
-		$check = (in_array($mailer,$mail_enable)) ? "checked='checked'" : "";
-		$text .= "&nbsp;<input type='checkbox' name='mail_mailer_enabled[]' value='{$mailer}' {$check} /> {$mailer}<br />";
-	  }
-	  $text .= "</td></tr>\n";
+	$mes->addDebug("@Steve :  email address sources pref are not being saved");
+	
+	if (isset($pref['e_mailout_list']))  // Allow selection of email address sources
+	{ 
+		$text .= "
+		<tr>
+			<td>".LAN_MAILOUT_77."</td>
+			<td> ";
+			
+	  		$mail_enable = explode(',',$pref['mailout_enabled']);
+	  
+			foreach ($pref['e_mailout_list'] as $mailer => $v)	 
+			 {
+				$check = (in_array($mailer,$mail_enable)) ? "checked='checked'" : "";
+				$text .= "&nbsp;<input type='checkbox' name='mail_mailer_enabled[]' value='{$mailer}' {$check} /> {$mailer}<br />";
+			}
+			  
+	 	 $text .= "</td></tr>\n";
 	}
 
 	list($mail_log_option,$mail_log_email) = explode(',',varset($pref['mail_log_options'],'0,0'));
+	
 	$check = ($mail_log_email == 1) ? " checked='checked'" : "";
+	
 	$text .= "<tr>
 		<td>".LAN_MAILOUT_72."</td>
 		<td> 
diff --git a/e107_handlers/mailout_admin_class.php b/e107_handlers/mailout_admin_class.php
index 375379bd5..a9913a618 100644
--- a/e107_handlers/mailout_admin_class.php
+++ b/e107_handlers/mailout_admin_class.php
@@ -483,15 +483,17 @@ class mailoutAdminClass extends e107MailManager
 		$ret = '';
 		$tab = '';
 		$tabc = '';
-		
-		$ret .= "<div class='admintabs' id='tab-container'>\n";
+
 		
 		foreach ($this->mailHandlers as $key => $m)
 		{
 			if ($m->mailerEnabled)
 			{
-				$tab .= "<li id='tab-main_".$key."'><a href='#main-mail-".$key."'>".$m->mailerName."</a></li>";
-				$tabc .= "<div id='main-mail-".$key."' style='padding:0px;border-collapse:collapse;'>";
+				$lactive = ($key == 'core') ? " class='active'" : '';
+				$tab .= "<li".$lactive."><a data-toggle='tab' href='#main-mail-".$key."'>".$m->mailerName."</a></li>";
+				
+				$pactive = ($key == 'core') ? 'active' : '';
+				$tabc .= "<div id='main-mail-".$key."' class='tab-pane ".$pactive."'>";
 				
 				$content = $m->showSelect(TRUE, varset($selectorInfo[$key], FALSE));
 				
@@ -520,7 +522,8 @@ class mailoutAdminClass extends e107MailManager
 		}
 
 //		$ret .= "<ul class='e-tabs e-hideme' id='core-mail-tabs'>".$tab."</ul>";		// This hides tabs!
-		$ret .= "<ul class='e-tabs' id='core-mail-tabs'>".$tab."</ul>";
+		$ret .= "<ul class='nav nav-tabs'>".$tab."</ul>";
+			$ret .= "<div class='tab-content'>\n";
 		$ret .= $tabc;	
 		$ret .= "</div>";