--- loncom/interface/lonmsgdisplay.pm	2006/04/08 06:53:37	1.1
+++ loncom/interface/lonmsgdisplay.pm	2006/04/23 03:00:34	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.1 2006/04/08 06:53:37 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.6 2006/04/23 03:00:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,7 +116,6 @@ recipients of the message/e-mail.
 
 use strict;
 use Apache::lonnet;
-use vars qw($msgcount);
 use HTML::TokeParser();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
@@ -173,7 +172,7 @@ sub scrollbuttons {
 
 sub statuschange {
     my ($msgid,$newstatus,$folder)=@_;
-    my $suffix=&foldersuffix($folder);
+    my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
     if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
     unless ($status{$msgid}) { $status{$msgid}='new'; }
@@ -205,8 +204,8 @@ sub makefolder {
 sub movemsg {
     my ($msgid,$srcfolder,$trgfolder)=@_;
     if ($srcfolder eq 'new') { $srcfolder=''; }
-    my $srcsuffix=&foldersuffix($srcfolder);
-    my $trgsuffix=&foldersuffix($trgfolder);
+    my $srcsuffix=&Apache::lonmsg::foldersuffix($srcfolder);
+    my $trgsuffix=&Apache::lonmsg::foldersuffix($trgfolder);
 
 # Copy message
     my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]);
@@ -314,7 +313,7 @@ ENDDISHEADER
 
 sub discrit {
     my $r=shift;
-    my $header = '<h1><font color=red>'.&mt('Critical Messages').'</font></h1>'.
+    my $header = '<h1><font color="red">'.&mt('Critical Messages').'</font></h1>'.
         '<form action="/adm/email" method="POST">'.
         '<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');
@@ -491,13 +490,12 @@ sub disnew {
     if ($#newmsgs >= 0) {
         $r->print(<<TABLEHEAD);
 <h2>$lt{'nm'}</h2>
-<table border=2><tr><th>&nbsp</th>
+<table class="LC_mail_list"><tr><th>&nbsp</th>
 <th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th><th>$lt{'co'}</th></tr>
 TABLEHEAD
         foreach my $msg (@newmsgs) {
             $r->print(<<"ENDLINK");
-<tr class="new" bgcolor="#FFBB77" onMouseOver="javascript:style.backgroundColor='#DD9955'" 
-onMouseOut="javascript:style.backgroundColor='#FFBB77'">
+<tr class="LC_mail_new">
 <td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td>
 ENDLINK
             foreach ('sendtime','from','fromdom','shortsub','course') {
@@ -589,7 +587,7 @@ ENDDISHEADER
     if ($lastdis>$#temp) { $lastdis=$#temp; }
     $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber));
     $r->print('<form method="post" name="disall" action="/adm/email">'.
-	      '<table border=2><tr><th colspan="3">&nbsp</th><th>');
+	      '<table class="LC_mail_list"><tr><th colspan="3">&nbsp</th><th>');
     if ($env{'form.sortedby'} eq "revdate") {
 	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
     } else {
@@ -626,24 +624,35 @@ ENDDISHEADER
      	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</a></th>');
     }
     $r->print("</tr>\n");
+
+    my $suffix = &Apache::lonmsg::foldersuffix($folder);
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,$description)= @{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
 	    if ($status eq 'new') {
-		$r->print('<tr bgcolor="#FFBB77" onMouseOver="javascript:style.backgroundColor=\'#DD9955\'"  onMouseOut="javascript:style.backgroundColor=\'#FFBB77\'">');
+		$r->print('<tr class="LC_mail_new">');
 	    } elsif ($status eq 'read') {
-		$r->print('<tr bgcolor="#BBBB77" onMouseOver="javascript:style.backgroundColor=\'#999944\'"  onMouseOut="javascript:style.backgroundColor=\'#BBBB77\'">');
+		$r->print('<tr class="LC_mail_read">');
 	    } elsif ($status eq 'replied') {
-		$r->print('<tr bgcolor="#AAAA88" onMouseOver="javascript:style.backgroundColor=\'#888855\'"  onMouseOut="javascript:style.backgroundColor=\'#AAAA88\'">'); 
+		$r->print('<tr class="LC_mail_replied">'); 
 	    } else {
-		$r->print('<tr bgcolor="#99BBBB" onMouseOver="javascript:style.backgroundColor=\'#669999\'"  onMouseOut="javascript:style.backgroundColor=\'#99BBBB\'">');
+		$r->print('<tr class="LC_mail_other">');
+	    }
+	    my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
+	    if ($folder eq 'sent') {
+		my $msg_id = &Apache::lonnet::unescape($origID);
+		my %message=&Apache::lonnet::get('nohist_email'.$suffix,
+						 [$msg_id]);
+		my %content=&Apache::lonmsg::unpackagemsg($message{$msg_id});
+		$dis_name   = join('<br />',@{$content{'recuser'}});
+		$dis_domain = join('<br />',@{$content{'recdomain'}});
 	    }
 	    $r->print('<td><input type="checkbox" name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs. 
 		      '">'.&mt('Open').'</a></td><td>'.
 		      ($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.
 		      '">'.&mt('Delete'):'&nbsp').'</a></td>'.
 		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
-		      $fromname.'</td><td>'.$fromdomain.'</td><td>'.
+		      $dis_name.'</td><td>'.$dis_domain.'</td><td>'.
 		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
                       $description.'</td><td>'.$status.'</td></tr>'."\n");
 	} elsif ($status eq 'deleted') {
@@ -1769,17 +1778,15 @@ sub sendoffmail {
 	&printheader($r,'','No messages sent.'); 
     }
     if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	$r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
+	$r->print('<br /><span class="LC_success">'.&mt('Completed.').'</span>');
 	if ($env{'form.displayedcrit'}) {
 	    &discrit($r);
 	} else {
 	    &Apache::loncommunicate::menu($r);
 	}
     } else {
-	$r->print(
-		  '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
-		  &mt('Please use the browser "Back" button and correct the recipient addresses')
-		  );
+	$r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
+		  &mt('Please use the browser "Back" button and correct the recipient addresses').'</p>');
     }
 }
 
@@ -1955,10 +1962,6 @@ sub handler {
 }
 # ================================================= Main program, reset counter
 
-BEGIN {
-    $msgcount=0;
-}
-
 =pod
 
 =back