--- loncom/interface/loncreateuser.pm	2006/05/30 20:12:15	1.119
+++ loncom/interface/loncreateuser.pm	2006/06/28 18:18:44	1.124
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.119 2006/05/30 20:12:15 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.124 2006/06/28 18:18:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -142,7 +142,7 @@ sub print_username_entry_form {
                     'nr'   => "Name of Role",
                     'cre'  => "Custom Role Editor"
 				       );
-    my $help = &Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
+    my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
     my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
     my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     $r->print(<<"ENDDOCUMENT");
@@ -246,8 +246,8 @@ sub print_user_modification_page {
         my @rolevals = ('st','ta','ep','in','cc');
         my (@crsroles,@grproles);
         for (my $i=0; $i<@rolevals; $i++) {
-            $crsroles[$i]=&Apache::lonnet::plaintext($rolevals[$i]);
-            $grproles[$i]=&Apache::loncommon::convert_role($crsroles[$i],'Group');
+            $crsroles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Course');
+            $grproles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Group');
         }
         my $rolevalslist = join('","',@rolevals);
         my $crsrolenameslist = join('","',@crsroles);
@@ -705,10 +705,7 @@ END
                }
 	       my $plaintext='';
 	       unless ($croletitle) {
-		   $plaintext=&Apache::lonnet::plaintext($role_code);
-                   if ($class eq 'Group') {
-                       $plaintext = &Apache::loncommon::convert_role($plaintext,$class);
-                   }
+                   $plaintext=&Apache::lonnet::plaintext($role_code,$class)
 	       } else {
 	           $plaintext=
 		"Customrole '$croletitle' defined by $croleuname\@$croleudom";
@@ -1601,11 +1598,6 @@ sub custom_role_editor {
 ENDCCF
     foreach my $priv (sort keys %full) {
         my $privtext = &Apache::lonnet::plaintext($priv);
-        if ($env{'course.'.$env{'request.course.id'}.'.type'}) {
-            $privtext =~ s/Student/Member/;
-            $privtext =~ s/student/member/;
-            $privtext =~ s/course/group/;
-        } 
 	$r->print('<tr><td>'.$privtext.'</td><td>'.
     ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.':c" '.
     ($courselevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
@@ -1773,9 +1765,6 @@ sub course_level_table {
 	foreach  ('st','ta','ep','in','cc') {
 	    if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
 		my $plrole=&Apache::lonnet::plaintext($_);
-                if ($type eq 'Group') {
-                    $plrole = &Apache::loncommon::convert_role($plrole,$type);
-                } 
 		$table .= <<ENDEXTENT;
 <tr bgcolor="#$bgcol">
 <td><input type="checkbox" name="act_$protectedcourse\_$_"></td>