--- loncom/interface/loncommon.pm	2006/05/30 12:46:08	1.376
+++ loncom/interface/loncommon.pm	2006/05/30 20:05:05	1.377
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.376 2006/05/30 12:46:08 www Exp $
+# $Id: loncommon.pm,v 1.377 2006/05/30 20:05:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -386,10 +386,11 @@ sub selectstudent_link {
 
 sub coursebrowser_javascript {
     my ($domainfilter)=@_;
+    my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
    return (<<ENDSTDBRW);
 <script type="text/javascript" language="Javascript" >
     var stdeditbrowser;
-    function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag) {
+    function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
         var url = '/adm/pickcourse?';
         var filter;
         if (filter != null) {
@@ -415,6 +416,18 @@ sub coursebrowser_javascript {
         if (multflag !=null && multflag != '') {
             url += '&multiple='+multflag;
         }
+        if (crstype == 'Course/Group') {
+            if (formname == 'cu') {
+                crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value; 
+                if (crstype == "") {
+                    alert("$crs_or_grp_alert");
+                    return;
+                }
+            }
+        }
+        if (crstype !=null && crstype != '') {
+            url += '&type='+crstype;
+        }
         var title = 'Course_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';
@@ -426,9 +439,9 @@ ENDSTDBRW
 }
 
 sub selectcourse_link {
-   my ($form,$unameele,$udomele,$desc,$extra_element,$multflag)=@_;
+   my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
     return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'");'."'>".&mt('Select Course')."</a>";
+        '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
 }
 
 sub check_uncheck_jscript {
@@ -2817,6 +2830,12 @@ sub bodytag {
 	&Apache::lonnet::plaintext((split(/\./,$env{'request.role'}))[0]);
 # 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);  
+            }
+        } 
 	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
     }
     if (!$realm) { $realm='&nbsp;'; }
@@ -4962,6 +4981,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/;
+    }
+    return $rolename;
+}
 
 sub icon {
     my ($file)=@_;