--- loncom/interface/loncommunicate.pm	2006/05/30 20:09:25	1.34
+++ loncom/interface/loncommunicate.pm	2006/12/06 23:44:33	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.34 2006/05/30 20:09:25 raeburn Exp $
+# $Id: loncommunicate.pm,v 1.36 2006/12/06 23:44:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,6 @@ sub menu {
         }   
     }
     my %lt=&Apache::lonlocal::texthash(
-'mnf' => 'Make New Folder',
 'vcm' => 'View Critical Messages',
 'smu' => 'Send Message to User(s)',
 'bmc' => "Broadcast Message to $crstype",
@@ -65,26 +64,36 @@ sub menu {
 	$help{$_}=&Apache::loncommon::help_open_topic($_);
     }
 # ------------------------------------------------------------------------ Menu
-   $r->print(<<END);
+    my ($can_srm,$can_dcm);
+    if ($env{'request.course.id'}) {
+        if ((&Apache::lonnet::allowed('srm',$env{'request.course.id'})) ||
+            (&Apache::lonnet::allowed('srm',$env{'request.course.id'}.'/'.
+                                           $env{'request.course.sec'}))) {
+            $can_srm = 1;
+        }
+        if ((&Apache::lonnet::allowed('dcm',$env{'request.course.id'})) ||
+            (&Apache::lonnet::allowed('dcm',$env{'request.course.id'}.'/'.
+                                           $env{'request.course.sec'}))) {
+            $can_dcm = 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>
+<tr>
 <td bgcolor="#FFFFAA">
   <b><a href="/adm/email?compose=individual">$lt{'smu'}</a></b>
-</td></tr>
-<tr><td bgcolor="#FFFFAA">
+</td>
+<td bgcolor="#FFFFAA">
   <b><a href="/adm/$env{'user.domain'}/$env{'user.name'}/_rss.html">$lt{'blog'}</a></b>
-</td><td></td></tr>
+</td>
+</tr>
 END
-    if (($env{'request.course.id'}) && 
-        (
-	 &Apache::lonnet::allowed('srm',$env{'request.course.id'}) ||
-	 &Apache::lonnet::allowed('srm',$env{'request.course.id'}.'/'.$env{'request.course.sec'})
-	 )) {
+    if ($can_srm || !$can_dcm) {
+        $r->print('<tr>');
+    }
+    if ($can_srm) {
         $r->print(<<END);
-<tr><td bgcolor="#FFFFAA">
+<td bgcolor="#FFFFAA">
     <b><a href="/adm/email?compose=group">$lt{'bmc'}</a></b>$help{'Course_Broadcast_Message'}
 </td>
 <td bgcolor="#FFFFAA">
@@ -93,11 +102,17 @@ END
 <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>
-<td bgcolor="#FFFFAA">
-  <b><a href="/adm/email?block=display">$lt{'cbs'}</a>
-</td></tr>
 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>');
 }