--- loncom/interface/loncommon.pm	2006/05/30 20:05:05	1.377
+++ loncom/interface/loncommon.pm	2006/06/02 13:58:31	1.378
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.377 2006/05/30 20:05:05 raeburn Exp $
+# $Id: loncommon.pm,v 1.378 2006/06/02 13:58:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2826,17 +2826,19 @@ sub bodytag {
     @$addentries{keys(%design)} = @design{keys(%design)};
 
  # role and realm
-    my ($role,$realm) =
-	&Apache::lonnet::plaintext((split(/\./,$env{'request.role'}))[0]);
+    my ($role,$realm) = split(/\./,$env{'request.role'},2);
+    if ($role  eq 'ca') {
+        my ($rdom,$rname) = ($realm =~ m-^/(\w+)/(\w+)$-);
+        $realm = &plainname($rname,$rdom).':'.$rdom;
+    } 
 # realm
     if ($env{'request.course.id'}) {
-        my $type = $env{'course.'.$env{'request.course.id'}.'.type'};
-        if ($type eq 'Group') {
-            if ($env{'request.role'} !~ /^cr/) { # Change role name if Group
-                $role = &convert_role($role,$type);  
-            }
-        } 
+        if ($env{'request.role'} !~ /^cr/) {
+            $role = &Apache::lonnet::plaintext($role,&course_type());
+        }
 	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
+    } else {
+        $role = &Apache::lonnet::plaintext($role);
     }
     if (!$realm) { $realm=' '; }
 # Set messages
@@ -4981,15 +4983,16 @@ sub restore_course_settings {
 ############################################################
 ############################################################
 
-sub convert_role {
-    my ($rolename,$type) = @_;
-    if ($type eq 'Group') {
-        $rolename =~ s/Course/Group/;
-        $rolename =~ s/Instructor/Leader/;
-        $rolename =~ s/Teaching Assistant/Assistant Leader/;
-        $rolename =~ s/Student/Member/;
+sub course_type {
+    my ($cid) = @_;
+    if (!defined($cid)) {
+        $cid = $env{'request.course.id'};
+    }
+    if (defined($env{'course.'.$cid.'type'})) {
+        return $env{'course.'.$cid.'type'};
+    } else {
+        return 'Course';
     }
-    return $rolename;
 }
 
 sub icon {