--- loncom/interface/loncommunicate.pm	2001/07/28 03:54:05	1.3
+++ loncom/interface/loncommunicate.pm	2001/12/19 17:17:46	1.7
@@ -1,6 +1,30 @@
 # The LearningOnline Network
 # Communicate
 #
+# $Id: loncommunicate.pm,v 1.7 2001/12/19 17:17:46 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Internal Server Error Handler
 #
 # (Login Screen
@@ -9,7 +33,8 @@
 #
 # 3/1/1 Gerd Kortemeyer)
 #
-# 3/1,2/6,7/27 Gerd Kortemeyer
+# 3/1,2/6,7/27,8/3,8/15,
+# 11/5/01 Gerd Kortemeyer
 #
 package Apache::loncommunicate;
 
@@ -33,10 +58,27 @@ sub handler {
 <body bgcolor="#FFFFFF">
 <img align=right src=/adm/lonIcons/lonlogos.gif>
 <h1>Communicate</h1>
+ENDDOCUMENT
+    my $st='<table><tr><td bgcolor="#FFFFAA"><b>';
+    my $en='</b></td><tr></table>';
+   $r->print('<p>'.
+ $st.'<a href="/adm/email/">All Messages</a>'.$en.'<p>'.
+ $st.'<a href="/adm/email?critical=display">Critical Messages</a>'.$en.'<p>'.
+ $st.'<a href="/adm/email?compose=individual">Send message to user(s)</a>'.$en
+     );
+    if (($ENV{'request.course.id'}) && 
+        (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+       $r->print(
+    '<p>'.$st.
+  '<a href="/adm/email?compose=group">Broadcast message to course</a>'.$en.
+    '<p>'.$st.
+  '<a href="/adm/email?compose=upload">Upload messages to course</a>'.$en);
+    }
+    $r->print(<<ENDTABLE);
 <h3>New Messages</h3>
 <table border=2><tr><th>&nbsp</th>
 <th>Date</th><th>Username</th><th>Domain</th><th>Subject</th></tr>
-ENDDOCUMENT
+ENDTABLE
     map {
         my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
 	    &Apache::lonmsg::unpackmsgid($_);
@@ -51,15 +93,7 @@ ENDDOCUMENT
 					$ENV{'user.domain'}.':'.
                                         $ENV{'user.name'}.':nohist_email',
                                         $ENV{'user.home'}));
-    $r->print(
-   '</table><p><a href="/adm/email/">All Messages</a>'.
-   '<p><a href="/adm/email?compose=individual">Send message to user(s)</a>');
-    if (($ENV{'request.course.id'}) && 
-        (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
-       $r->print(
-    '<p><a href="/adm/email?compose=group">Broadcast message to course</a>');
-    }
-    $r->print('</body></html>');
+    $r->print('</table></body></html>');
     return OK;
 }
 
