--- loncom/interface/loncommunicate.pm	2002/05/07 19:24:28	1.9
+++ loncom/interface/loncommunicate.pm	2003/10/04 20:49:40	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.9 2002/05/07 19:24:28 matthew Exp $
+# $Id: loncommunicate.pm,v 1.17 2003/10/04 20:49:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,10 +41,12 @@ package Apache::loncommunicate;
 use strict;
 use Apache::Constants qw(:common);
 use Apache::lonmsg();
+use Apache::loncommon;
+use Apache::lonlocal;
 
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 #
@@ -55,31 +57,49 @@ sub handler {
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Communicate</h1>
 END
+   my %lt=&Apache::lonlocal::texthash(
+'vam' => 'View All Messages',
+'vcm' => 'View Critical Messages',
+'smu' => 'Send Message to User(s)',
+'bmc' => 'Broadcast Message to Course',
+'dmu' => 'Distribute Messages from Uploaded File to Course',
+'unr' => 
+     'User Notes, Records of Face-to-Face Discussions, and Critical Messages',
+'nm' => 'New Messages',
+'su' => 'Subject',
+'da' => 'Date',
+'us' => 'Username',
+'op' => 'Open',
+'do' => 'Domain'
+);
+
+   $r->print(&Apache::loncommon::bodytag("Communication and Messages"));
    $r->print(<<END);
 <table cellspacing="10" cellpadding="2">
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email/">View All Messages</a></b>
+  <b><a href="/adm/email/">$lt{'vam'}</a></b>
 </td></tr>
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?critical=display">View Critical Messages</a></b>
+  <b><a href="/adm/email?critical=display">$lt{'vcm'}</a></b>
 </td></tr>
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?compose=individual">Send message to user(s)</a></b>
+  <b><a href="/adm/email?compose=individual">$lt{'smu'}</a></b>
 </td></tr>
 END
     if (($ENV{'request.course.id'}) && 
         (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
         $r->print(<<END);
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?compose=group">Broadcast message to course</a></b>
+  <b><a href="/adm/email?compose=group">$lt{'bmc'}</a></b>
+</td></tr>
+<tr><td bgcolor="#FFFFAA">
+  <b><a href="/adm/email?compose=upload">$lt{'dmu'}</a></b>
 </td></tr>
 <tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?compose=upload">Upload messages to course</a></b>
+  <b><a href="/adm/email?recordftf=query">$lt{'unr'}</a></b>
 </td></tr>
+
 END
     }
     $r->print('</table>');
@@ -91,7 +111,8 @@ END
     foreach (@msgids) {
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
 	    &Apache::lonmsg::unpackmsgid($_);
-        $sendtime = localtime($sendtime);
+       if (defined($sendtime) && $sendtime!~/error/) {
+        $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
         if ($status eq 'new') {
             push @newmsgs, { 
                 msgid    => $_,
@@ -101,17 +122,18 @@ END
                 fromdom  => $fromdom 
                 }
         }
+       }
     }
     if ($#newmsgs >= 0) {
         $r->print(<<TABLEHEAD);
-<h3>New Messages</h3>
+<h3>$lt{'nm'}</h3>
 <table border=2><tr><th>&nbsp</th>
-<th>Date</th><th>Username</th><th>Domain</th><th>Subject</th></tr>
+<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th></tr>
 TABLEHEAD
         foreach my $msg (@newmsgs) {
             $r->print(<<"ENDLINK");
 <tr bgcolor="#FFBB77">
-<td><a href="/adm/email?display=$msg->{'msgid'}">Open</a></td>
+<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
 ENDLINK
             foreach ('sendtime','from','fromdom','shortsub') {
                 $r->print("<td>$msg->{$_}</td>");
@@ -120,7 +142,7 @@ ENDLINK
         }
         $r->print('</table></body></html>');
     } else {
-        $r->print("<h3>You have no unread messages</h3>");
+        $r->print("<h3>".&mt('You have no unread messages')."</h3>");
     }
     return OK;
 }
