--- loncom/interface/lonmenu.pm	2009/10/29 16:15:57	1.297
+++ loncom/interface/lonmenu.pm	2009/11/03 20:04:05	1.299
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.297 2009/10/29 16:15:57 raeburn Exp $
+# $Id: lonmenu.pm,v 1.299 2009/11/03 20:04:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -150,7 +150,7 @@ sub prep_menuitem {
     } else {             # textual Link
         $link = &mt($$menuitem[3]);
     }
-    return '<li><a href="'.$$menuitem[0].'" target="_top">'.$link.'</a></li>';
+    return '<li><a href="'.$$menuitem[0].'">'.$link.'</a></li>';
 }
 
 # primary_menu() evaluates @primary_menu and returns XHTML for the menu
@@ -235,7 +235,7 @@ sub secondary_menu {
 
         if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
             # special treatment for role selector
-            my $roles_selector = roles_selector(
+            my $roles_selector = &roles_selector(
                         $env{'course.' . $env{'request.course.id'} . '.domain'},
                         $env{'course.' . $env{'request.course.id'} . '.num'}  );
 
@@ -545,7 +545,13 @@ sub innerregister {
 
         my $maptitle = &Apache::lonnet::gettitle($mapurl);
         my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
-        my @crumbs = ({text  => "Course Contents", 
+        my $contentstext;
+        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
+            $contentstext = &mt('Community Contents');
+        } else {
+            $contentstext = &mt('Course Contents');
+        }
+        my @crumbs = ({text  => $contentstext, 
                        href  => "Javascript:gonav('/adm/navmaps')"});
 
         if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
@@ -1794,16 +1800,19 @@ sub hidden_button_check {
 
 sub roles_selector {
     my ($cdom,$cnum) = @_;
-    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
-    if ($crstype eq '') {
-        $crstype = 'Course';
-    }
+    my $crstype = &Apache::loncommon::course_type();
     my $now = time;
     my (%courseroles,%seccount);
     my $is_cc;
     my $role_selector;
-    if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) {
-        my ($start,$end) = split(/\./,$env{'user.role.cc./'.$cdom.'/'.$cnum});
+    my $ccrole;
+    if ($crstype eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    } 
+    if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
+        my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});
         
         if ((($start) && ($start<0)) || 
             (($end) && ($end<$now))  ||
@@ -1853,7 +1862,7 @@ sub roles_selector {
     } else {
         $switchtext = &mt('Switch course role to...')
     }
-    my @roles_order = ('cc','in','ta','ep','ad','st');
+    my @roles_order = ($ccrole,'in','ta','ep','ad','st');
     if (keys(%courseroles) > 1) {
         $role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles);
         $role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">
@@ -1861,7 +1870,7 @@ sub roles_selector {
         $role_selector .= '<option value="">'.$switchtext.'</option>';
         foreach my $role (@roles_order) {
             if (defined($courseroles{$role})) {
-                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; 
+                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>'; 
             }
         }
         foreach my $role (sort(keys(%courseroles))) {