--- loncom/interface/loncommunicate.pm	2006/11/29 07:53:55	1.35
+++ loncom/interface/loncommunicate.pm	2012/04/18 19:56:59	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.35 2006/11/29 07:53:55 raeburn Exp $
+# $Id: loncommunicate.pm,v 1.47 2012/04/18 19:56:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,34 +38,18 @@ use Apache::lonnet;
 
 sub menu {
     my $r=shift;
-    my $crstype = 'Course';
-    my $usertype = 'Student';
+    my $crstype = 'course';
+    my $usertype = 'student';
     if (defined($env{'course.'.$env{'request.course.id'}.'.type'})) {
         $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
-        if ($crstype eq 'Group') {
-            $usertype = 'Member';
+        if ($crstype eq 'Community') {
+            $usertype = 'member';
         }   
     }
-    my %lt=&Apache::lonlocal::texthash(
-'mnf' => 'Make New Folder',
-'vcm' => 'View Critical Messages',
-'smu' => 'Send Message to User(s)',
-'bmc' => "Broadcast Message to $crstype",
-'dmu' => "Distribute Messages from Uploaded File to $crstype",
-'unr' => 
-     'User Notes, Records of Face-to-Face Discussions, and Critical Messages',
-
-'cbs' => "Configure Blocking of $usertype Communication during Exams",
-'blog' => 'Add or Edit Blog Entries' 
-
-);
-    my %help=();
-    foreach ('Course_Face_To_Face_Records,Course_Critical_Message',
-	     'Course_Broadcast_Message') {
-	$help{$_}=&Apache::loncommon::help_open_topic($_);
-    }
+	
+
 # ------------------------------------------------------------------------ Menu
-    my ($can_srm,$can_dcm);
+    my ($can_srm,$can_dcm,$can_dff);
     if ($env{'request.course.id'}) {
         if ((&Apache::lonnet::allowed('srm',$env{'request.course.id'})) ||
             (&Apache::lonnet::allowed('srm',$env{'request.course.id'}.'/'.
@@ -77,46 +61,56 @@ sub menu {
                                            $env{'request.course.sec'}))) {
             $can_dcm = 1;
         }
+        if ((&Apache::lonnet::allowed('dff',$env{'request.course.id'})) ||
+            (&Apache::lonnet::allowed('dff',$env{'request.course.id'}.'/'.
+                                           $env{'request.course.sec'}))) {
+            $can_dff = 1;
+        }
     }   
-    $r->print(<<END);
-<table cellspacing="10" cellpadding="2">
-<tr><td bgcolor="#FFFFAA"><form method="post" action="/adm/email">
-<input type="submit" value="$lt{'mnf'}" />
-<input type="text" size="15" name="newfolder" value="" />
-</form></td>
-<td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?compose=individual">$lt{'smu'}</a></b>
-</td></tr>
-<tr><td bgcolor="#FFFFAA">
-  <b><a href="/adm/$env{'user.domain'}/$env{'user.name'}/_rss.html">$lt{'blog'}</a></b>
-</td>
-END
-    if ($can_srm || !$can_dcm) {
-        $r->print('<td></td></tr>');
-    }
-    if ($can_srm) {
-        $r->print(<<END);
-<tr><td bgcolor="#FFFFAA">
-    <b><a href="/adm/email?compose=group">$lt{'bmc'}</a></b>$help{'Course_Broadcast_Message'}
-</td>
-<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?recordftf=query">$lt{'unr'}</a></b>$help{'Course_Face_To_Face_Records,Course_Critical_Message'}
-</td>
-END
-    }
-    if ($can_dcm) {
-        $r->print('
-<td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?block=display">'.$lt{'cbs'}.'</a>
-</td>');
-    }
-    if ($can_srm || $can_dcm) {
-        $r->print('</tr>');
-    }
-    $r->print('</table>');
+
+	my @reports = (
+	    {categorytitle => 'Send Messages',
+         items => [
+            {url => '/adm/email?compose=individual',
+			 permission => 'F',
+			 icon => 'mail-message-new.png',
+             linktext => 'New Message',
+             linktitle => 'Send a message to users.'},
+       
+            {url => '/adm/email?compose=group',
+			 permission => "$can_srm",
+             icon => 'mail-reply-all.png',
+             linktext => 'New Broadcast Message',
+			 help => 'Course_Broadcast_Message',
+             linktitle => "Send a broadcast message to members of this $crstype and/or other users."},
+			 
+			{url => '/adm/email?compose=upload',
+			 permission => "$can_srm",
+             icon => 'fromfile.png',
+             linktext => 'New Messages from File',
+			 linktitle => 'Create a message from file and send to users.'},
+         ]},
+		);
+		
+		if ($can_dff || $can_dcm ){
+		push(@reports,{categorytitle => 'Message Administration',
+         items => [
+            {url => '/adm/email?recordftf=query',
+			 permission => "$can_dff",
+             icon => 'messalog.png',
+             linktext => 'Message Log for Selected Users',
+			 help => 'Course_Face_To_Face_Records,Course_Critical_Message',
+             linktitle => "User notes, records of face-to-face discussions, critical messages, broadcast messages and archived messages in $crstype."},
+                    
+            {url => '/adm/setblock?caller=email',
+			 permission => "$can_dcm",
+             icon => 'comblock.png',
+			 linktext => 'Communication Blocking',
+             linktitle => "Blocking of $usertype communication during exams."},
+         ]});
+        }
+$r->print(&Apache::lonhtmlcommon::generate_menu(@reports));
+
 }
 
 sub handler {
@@ -138,7 +132,7 @@ sub handler {
 # ---------------------------------------------------------------------- Header
     &Apache::lonmsgdisplay::header($r);
     &menu($r);
-    &Apache::lonmsgdisplay::disall($r,'new');
+    &Apache::lonmsgdisplay::disall($r);
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }