--- loncom/interface/lonmsgdisplay.pm	2010/02/12 15:21:37	1.148
+++ loncom/interface/lonmsgdisplay.pm	2010/06/06 02:40:30	1.153
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.148 2010/02/12 15:21:37 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.153 2010/06/06 02:40:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -225,18 +225,18 @@ function folder_choice(targetform,caller
    <table border="0" cellspacing="2" cellpadding="8">
     <tr>
      <td><b>'.$lt{'fold'}.'</b><br />'."\n".
-         &Apache::loncommon::select_form($folder,'folder',%formhash).'
+         &Apache::loncommon::select_form($folder,'folder',\%formhash).'
      </td>
      <td><b>'.$lt{'show'}.'</b><br />'."\n".
          &Apache::loncommon::select_form($env{'form.interdis'},'interdis',
-					 %show).'
+					 \%show).'
      </td>
      <td><b>'.$lt{'status'}.'</b><br />'."\n".
-       &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'
+       &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
      </td>
      <td><b>'.$lt{'actn'}.'</b><br />'."\n".'
          <span class="LC_nobreak">'.
-         &Apache::loncommon::select_form('view','folderaction',%actions).
+         &Apache::loncommon::select_form('view','folderaction',\%actions).
          ' <input type="button" value="'.$lt{'go'}.
          '" onclick="javascript:folder_choice(this.form,'."'change'".');" />
          </span>
@@ -1098,7 +1098,9 @@ ENDDISHEADER
     if ($lastdis>$#temp) { $lastdis=$#temp; }
     $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber,$msgstatus));
     $r->print('<form method="post" name="disall" action="/adm/email">'.
-	      '<table class="LC_mail_list"><tr><th colspan="1">&nbsp;</th><th>');
+	      &Apache::loncommon::start_data_table().
+          &Apache::loncommon::start_data_table_row().
+          '<th colspan="1">&nbsp;</th><th>');
     if ($env{'form.sortedby'} eq "revdate") {
 	$r->print('<a href = "/adm/email?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
     } else {
@@ -1128,7 +1130,7 @@ ENDDISHEADER
     } else {
         $r->print('<a href = "/adm/email?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>');
     }
-    $r->print('</th><th>');
+    $r->print('</th><th colspan="2">');
     if ($env{'form.sortedby'} eq "revstatus") {
 	$r->print('<a href = "/adm/email?sortedby=status'.$fsqs.'">'.&mt('Status').'</a></th>');
     } else {
@@ -1142,17 +1144,19 @@ ENDDISHEADER
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID,
 	    $description,$recv_name,$recv_domain)= 
 		@{$temp[$n]};
-	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+        if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
+            my $class_msgstatus = '';
             $count ++;
-	    if ($status eq 'new') {
-		$r->print('<tr class="LC_mail_new">');
-	    } elsif ($status eq 'read') {
-		$r->print('<tr class="LC_mail_read">');
-	    } elsif ($status eq 'replied') {
-		$r->print('<tr class="LC_mail_replied">'); 
-	    } else {
-		$r->print('<tr class="LC_mail_other">');
-	    }
+            if ($status eq 'new') {
+                $class_msgstatus = 'LC_mail_new';
+            } elsif ($status eq 'read') {
+                $class_msgstatus = 'LC_mail_read';
+            } elsif ($status eq 'replied') {
+                $class_msgstatus = 'LC_mail_replied'; 
+            } else {
+                $class_msgstatus = 'LC_mail_other';
+            }
+            $r->print(&Apache::loncommon::start_data_table_row($class_msgstatus));
 	    my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
 	    if ($folder eq 'sent') {
                 if (defined($recv_name) && defined($recv_domain)) {
@@ -1184,6 +1188,7 @@ ENDDISHEADER
                           '<a href="/adm/email?display='.$origID.$sqs.'">'.
                           $item.(($status eq 'new')?'</b>':'').'</a></td>');
             }
+            # Description and Status
             my $showstatus;
             my %statushash = &get_msgstatus_types();
             if ($status eq '') {
@@ -1191,18 +1196,27 @@ ENDDISHEADER
             } else {
                 $showstatus = $statushash{$status};
             }
-	    $r->print('<td>'.(($status eq 'new')?'<b>':'').$description.
-                      (($status eq 'new')?'</b>':'').'</td><td>'.
-                      (($status eq 'new')?'<b>':'').$showstatus.
-                      (($status eq 'new')?'</b>':'').'</td></tr>'."\n");
-	} elsif ($status eq 'deleted') {
+            $r->print('<td>'.(($status eq 'new')?'<b>':'').$description.
+                      (($status eq 'new')?'</b>':'').
+                      '</td>');
+            $r->print('<td class="'.$class_msgstatus.'">&nbsp;&nbsp;</td>'.
+                      '<td>'.
+                      (($status eq 'new')?'<b>':'').&mt($showstatus).
+                      (($status eq 'new')?'</b>':'').
+                      '</td>');
+
+            $r->print(&Apache::loncommon::end_data_table_row());
+
+        } elsif ($status eq 'deleted') {
 # purge
-	    my ($result,$msg) = 
-		&movemsg(&unescape($origID),$folder,'trash');
-	    
-	}
+            my ($result,$msg) = 
+        	&movemsg(&unescape($origID),$folder,'trash');
+        }
     }   
-    $r->print("</table>\n");
+    $r->print(&Apache::loncommon::end_data_table());
+
+
+    # Bottom Functions
     $r->print('<table border="0" cellspacing="2" cellpadding="8">
  <tr>
   <td>
@@ -1243,7 +1257,7 @@ ENDDISHEADER
             $userfolders{$key} = $key;
         }
         $userfolders{''} = "";
-        $r->print(&Apache::loncommon::select_form('','movetofolder',%userfolders).
+        $r->print(&Apache::loncommon::select_form('','movetofolder',\%userfolders).
                   '</td>');
     }
     $r->print('<td>'.
@@ -1995,6 +2009,7 @@ sub facetoface {
              .&Apache::lonhtmlcommon::end_pick_box()
              .'<br />'
              .'<input type="submit" value="'.$lt{'subm'}.'" />'
+             .'</form>'
     );
 
     if (($stage ne 'query') &&
@@ -3170,7 +3185,7 @@ sub sendoffmail {
 	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
             if ($toaddr{$address}) {
-	        $msgtxt.='<hr />'.$toaddr{$address};
+	        $msgtxt.="\n".'<hr />'."\n".$toaddr{$address};
             }
 	    my @thismsg;
 	    if ($msgtype eq 'critical') {
@@ -3295,6 +3310,9 @@ sub sendoffmail {
                 $r->print($message);
             }
         }
+    } else {
+        &printheader($r,'','Messages cancelled.');
+        return 'cancelled';
     }
     return $sendstatus;
 }