--- loncom/interface/lonmenu.pm	2010/01/18 21:35:55	1.244.2.12
+++ loncom/interface/lonmenu.pm	2010/05/23 20:46:51	1.244.2.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.244.2.12 2010/01/18 21:35:55 raeburn Exp $
+# $Id: lonmenu.pm,v 1.244.2.16 2010/05/23 20:46:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -163,8 +163,8 @@ sub show_course {
 }
 
 sub initlittle {
-    return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
-				       'nav' => 'Navigate Contents',
+    my %lt=&Apache::lonlocal::texthash('ret' => 'Return to Last Location',
+				       'nav' => 'Course Contents',
 				       'main' => 'Main Menu',
                                        'roles' => (&Apache::loncommon::show_course()?
                                                     'Courses':'Roles'),
@@ -174,8 +174,12 @@ sub initlittle {
                                        'login' => 'Log In',
 				       'launch' => 'Launch Remote Control',
                                        'groups' => 'Groups',
-                                       'gdoc' => 'Community Documents',
                                        );
+    if (&Apache::loncommon::course_type() eq 'Community') {
+        $lt{'nav'} = &mt('Community Contents');
+        $lt{'docs'} = &mt('Edit Community');
+    }
+    return %lt;
 }
 
 sub menubuttons {
@@ -242,12 +246,9 @@ ENDNAV
 <a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
 ENDRELOAD
             }
-            my $is_community =
-                (&Apache::loncommon::course_type() eq 'Community');
             if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
                 $docs=(<<ENDDOCS);
-<a href="/adm/coursedocs" target="_top">$text</a>
+<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>
 ENDDOCS
             }
             if ($showgroups) {
@@ -312,12 +313,9 @@ ENDINLINEMENU
 	    $navmaps=(<<ENDNAV);
 <td><a href="$link" target="_top">$lt{'nav'}</a></td>
 ENDNAV
-            my $is_community =
-                (&Apache::loncommon::course_type() eq 'Community');
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
 		$docs=(<<ENDDOCS);
-<td><a href="/adm/coursedocs" target="_top">$text</a></td>
+<td><a href="/adm/coursedocs" target="_top">$lt{'docs'}</a></td>
 ENDDOCS
             }
             if ($showgroups) {
@@ -576,10 +574,22 @@ sub innerregister {
             }        
             # Finally, turn the button on or off
             if ($cfile && !$const_space) {
-                $editbutton=&switch
-                    ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
+                my $nocrsedit;
+                # Suppress display where CC has switched to student role.
+                if ($env{'request.course.id'}) {
+                    unless(&Apache::lonnet::allowed('mdc',
+                                                    $env{'request.course.id'})) {
+                        $nocrsedit = 1;
+                    }
+                }
+                if ($nocrsedit) {
+                    $editbutton=&clear(6,1);
+                } else {
+                    $editbutton=&switch
+                       ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
-                $noeditbutton = 0;
+                    $noeditbutton = 0;
+                }
             } elsif ($editbutton eq '') {
                 $editbutton=&clear(6,1);
             }
@@ -1238,7 +1248,6 @@ sub rawconfig {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
-        $prt=~s/\$crs/$crs/g;
         if ($prt =~ /\$crs/) {
             next unless ($env{'request.course.id'});
             next if ($crstype eq 'Community');
@@ -1709,6 +1718,7 @@ sub roles_selector {
     my (%courseroles,%seccount);
     my $is_cc;
     my $role_selector;
+    my $ccrole;
     if ($crstype eq 'Community') {
         $ccrole = 'co';
     } else {