--- loncom/auth/lonroles.pm	2009/10/26 21:16:38	1.236
+++ loncom/auth/lonroles.pm	2010/10/06 18:46:53	1.240.2.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.236 2009/10/26 21:16:38 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.18 2010/10/06 18:46:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,6 +138,7 @@ use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonpageflip();
 use Apache::lonnavdisplay();
+use Apache::loncoursequeueadmin;
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities;
@@ -164,6 +165,7 @@ sub redirect_user {
     my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
                                                     {'redirect' => [1,$url],
                                                      'bread_crumbs' => $brcrum,});
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $end_page   = &Apache::loncommon::end_page();
 
 # Note to style police: 
@@ -224,6 +226,7 @@ sub handler {
     my %dcroles = ();
     my $numdc = &check_fordc(\%dcroles,$then);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+    my $custommenu = &Apache::loncommon::needs_gci_custom();
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
@@ -255,12 +258,12 @@ sub handler {
 # Check if user is a DC trying to enter a course or author space and needs privs to be created
         if ($numdc > 0) {
             foreach my $envkey (keys %env) {
-# Is this an ad-hoc CC-role?
-                if (my ($domain,$coursenum) =
-		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
+# Is this an ad-hoc Coordinator role?
+                if (my ($ccrole,$domain,$coursenum) =
+		    ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
                     if ($dcroles{$domain}) {
                         &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
-                                                           $then,$refresh,$now,'cc');
+                                                           $then,$refresh,$now,$ccrole);
                     }
                     last;
                 }
@@ -318,7 +321,9 @@ sub handler {
                 }
             }
         }
-
+        if (($env{'form.cm'}) && ($env{'form.orgurl'})) { 
+            $r->internal_redirect($env{'form.orgurl'});
+        }
         foreach $envkey (keys %env) {
             next if ($envkey!~/^user\.role\./);
             my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
@@ -445,8 +450,16 @@ ENDENTERKEY
 
 		    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
                         my $msg;
+                        if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
+                        &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+                        if ($custommenu) {
+                            unless (($ferr) || ($env{'form.switchrole'})) {
+                                &Apache::lonnet::put('nohist_crslastlogin',{$env{'user.name'}.':'.$env{'user.domain'}.':'.$csec.':'.$role => $now},
+                                                     $cdom,$cnum);
+                            }
+                        }
 			if (($env{'form.orgurl'}) && 
 			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$env{'form.orgurl'};
@@ -458,8 +471,6 @@ ENDENTERKEY
                                 }
                                 $dest .= 'symb='.$env{'form.symb'};
                             }
-			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
                             if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$dest);
 			    } else {
@@ -478,8 +489,6 @@ ENDENTERKEY
                     .'<p>'.&mt('Please try again.').'</p>'
                     .'<p>'.$ferr.'</p>';
 			    }
-			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
 
 			    if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$furl);
@@ -491,8 +500,8 @@ ENDENTERKEY
 				    $courseid = substr($courseid, 1);
 				}
 				$courseid =~ s/\//_/;
-				if ($role eq 'cc' && $env{'course.' . $courseid . 
-							      '.course.helper.not.run'}) {
+				if (($cdom ne 'gcitest') && (($role eq 'cc') || ($role eq 'co')) 
+                                    && ($env{'course.' . $courseid .'.course.helper.not.run'})) { 
 				    $furl = "/adm/helper/course.initialization.helper";
 				    # Send the user to the course they selected
 				} elsif ($env{'request.course.id'}) {
@@ -515,7 +524,7 @@ ENDENTERKEY
 								    .$env{'request.course.sec'})
 					) {
 					my $startpage = &courseloadpage($courseid);
-					unless ($startpage eq 'firstres') {         
+					unless (($startpage eq 'firstres') || ($cdom eq 'gcitest')) {
 					    $msg = &mt('Entering [_1] ...',
 						       $env{'course.'.$courseid.'.description'});
 					    &redirect_user($r,&mt('New in course'),
@@ -530,6 +539,9 @@ ENDENTERKEY
 # Guess not ...
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}
+                                if (($cdom eq 'gcitest') && ($custommenu)) {
+                                    $furl = '/adm/navmaps';
+                                }
                                 $msg = &mt('Entering [_1] ...',
 					   $env{'course.'.$courseid.'.description'});
 				&redirect_user($r,&mt('Entering [_1]',
@@ -572,7 +584,6 @@ ENDENTERKEY
         }
     }
 
-
 # =============================================================== No Roles Init
 
     &Apache::loncommon::content_type($r,'text/html');
@@ -580,23 +591,47 @@ ENDENTERKEY
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my $crumbtext = 'User Roles';
-    my $pagetitle = 'My Roles';
-    my $recent = &mt('Recent Roles');
-    my $show_course=&Apache::loncommon::show_course();
-    if ($show_course) {
-        $crumbtext = 'Courses';
-        $pagetitle = 'My Courses';
-        $recent = &mt('Recent Courses');
-    }
-    my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
-    my $swinfo=&Apache::lonmenu::rawconfig();
-    my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
-    my $standby=&mt('Role selected. Please stand by.');
-    $standby=~s/\n/\\n/g;
+    my ($crumbtext,$pagetitle,$recent,$show_course);
+    $show_course=&Apache::loncommon::show_course();
     my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
-
-    $r->print(<<ENDHEADER);
+    if ($custommenu) {
+        my $brcrum = {'bread_crumbs' => 1};
+        if ($env{'form.destinationurl'} eq '/adm/gci_info') {
+            undef($brcrum); 
+        }
+        my $start_page = &Apache::loncommon::start_page('Main Menu',undef,$brcrum);
+        $r->print(<<"ENDCUSTOM");
+$start_page
+<br />
+<noscript>
+$noscript
+</noscript>
+ENDCUSTOM
+    } else {
+        $crumbtext = 'User Roles';
+        $pagetitle = 'My Roles';
+        $recent = &mt('Recent Roles');
+        my $standby=&mt('Role selected. Please stand by.');
+        if ($show_course) {
+            $crumbtext = 'Courses';
+            $pagetitle = 'My Courses';
+            $recent = &mt('Recent Courses');
+            $standby = &mt('Course selected. Please stand by.');
+        }
+        my $brcrum = [{ href    => '/adm/roles',
+                         text    => $crumbtext,},
+                     ];
+        my $args;
+        if (($env{'user.domain'} eq 'gcitest') && (!$numdc)) {
+            $args = {bread_crumbs        => $brcrum,
+                     bread_crumbs_nomenu => 1};
+        } else {
+            $args = {bread_crumbs => $brcrum};
+        }
+        my $start_page=&Apache::loncommon::start_page($pagetitle,undef,$args);
+        my $swinfo=&Apache::lonmenu::rawconfig();
+        $standby=~s/\n/\\n/g;
+        $r->print(<<ENDHEADER);
 $start_page
 <br />
 <noscript>
@@ -623,6 +658,7 @@ function enterrole (thisform,rolecode,bu
 // ]]>
 </script>
 ENDHEADER
+    }
 
 # ------------------------------------------ Get Error Message from Environment
 
@@ -690,10 +726,12 @@ ENDHEADER
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
         }
-        $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
-        $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
-        $r->print('<input type="hidden" name="selectrole" value="1" />');
-        $r->print('<input type="hidden" name="newrole" value="" />');
+        unless ($custommenu) {
+            $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
+            $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
+            $r->print('<input type="hidden" name="selectrole" value="1" />');
+            $r->print('<input type="hidden" name="newrole" value="" />');
+        }
     }
 
     my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
@@ -703,29 +741,74 @@ ENDHEADER
 
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
+    if (!$countactive && !$countfuture) {
+        if (&Apache::loncommon::new_roles_update()) {
+            ($countactive,$countfuture,$inrole,$possiblerole) =
+                &gather_roles($then,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,
+                              \%roleclass,\%futureroles,\%timezones);
+        }
+    }
+    if ($custommenu) {
+        if ($env{'form.destinationurl'} eq '/adm/gci_info') {
+            $r->print(&gci_info_page()).
+            &Apache::loncommon::end_page();
+            return OK;
+        }
+        my %courses = &Apache::loncommon::existing_gcitest_courses('cc');
+        $env{'browser.interface'}='faketextual';
+        $env{'environment.remote'}='off';
+        my $numcourses = keys(%courses);
+        my $switcher;
+        if ($numcourses > 0) {
+            $switcher = &Apache::loncommon::gcitest_switcher('cc',%courses);
+            my $current;
+            if ($env{'request.course.id'}) {
+                $current = 'cc./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
+                           '/'.$env{'course.'.$env{'request.course.id'}.'.num'};
+            }
+            my $switcher_js = &Apache::loncommon::gcitest_switcher_js($current,$numcourses);
+            $r->print(<<"ENDSCRIPT");
+<script type="text/javascript">
+// <![CDATA[
+$switcher_js
+// ]]>
+</script>
+ENDSCRIPT
+        }
+        $r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).
+                  &Apache::loncommon::end_page());
+        return OK;
+    } else {
+        if ($env{'form.destinationurl'} eq '/adm/gci_info') {
+            delete($env{'form.destinationurl'});
+        }
+    }
     if ($env{'user.adv'}) {
-        $r->print(
-              '<p><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
+        $r->print('<p><label><input type="checkbox" name="showall"');
         if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
-        $r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></p>');
+        $r->print(' />'.&mt('Show all roles').'</label>'
+                 .' <input type="submit" value="'.&mt('Update display').'" />'
+                 .'</p>');
     } else {
         if ($countactive > 0) {
-            &queued_selfenrollment($r);
+            $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
-            $r->print(
-                '<p>'
-               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
-                   .' to view all [_4] LON-CAPA courses and communities.'
-                   ,'<b>'
-                   ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                   ,'</a></b>',$domdesc)
-               .'<br />'
-               .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
+            unless ($env{'user.domain'} eq 'gcitest') {
+                $r->print(
+                    '<p>'
+                   .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
+                       .' to view all [_4] LON-CAPA courses and communities.'
+                       ,'<b>'
+                       ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
+                       ,'</a></b>',$domdesc)
+                   .'<br />'
+                   .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
                    .' you may be able to enroll if self-enrollment is permitted.'
                    ,'<b>','</b>')
-               .'</p>'
-            );
+                   .'</p>'
+                );
+            }
         }
     }
 
@@ -734,13 +817,31 @@ ENDHEADER
 	if ($inrole) {
 	    $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
 	} else {
-	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
+            if ($show_course) {
+                if ($env{'user.domain'} eq 'gcitest') {
+                    $r->print('<h2>'.&mt('Currently no active Concept Tests').'</h2>');
+                } else { 
+                    $r->print('<h2>'.&mt('Currently no active courses or communities').'</h2>');
+                }
+            } else {
+	        $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
+            }
 	}
-        &findcourse_advice($r);
-        &requestcourse_advice($r); 
+        unless ($env{'user.domain'} eq 'gcitest') {
+            &findcourse_advice($r);
+            &requestcourse_advice($r);
+        }
 	$r->print('</form>');
         if ($countfuture) {
-            $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
+            if ($show_course) {
+                if ($env{'user.domain'} eq 'gcitest') {
+                    $r->print(&mt('The following [quant,_1,Concept Test] will be available in the future:',$countfuture));
+                } else {
+                    $r->print(&mt('The following [quant,_1,course] will become active in the future:',$countfuture));
+                }
+            } else {
+                $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
+            }
             my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,
                                                $nochoose);
             &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,
@@ -766,9 +867,30 @@ ENDHEADER
         }
         $r->print(&Apache::loncommon::end_page());
 	return OK;
+    } elsif ($countactive==1) { # Is there only one choice?
+        my $needs_switchserver;
+        if ($env{'user.author'}) {
+            $needs_switchserver = &check_needs_switchserver($possiblerole);
+        }
+        if ((!$needs_switchserver) && ($env{'request.role'} eq 'cm')) {
+            $r->print('<h3>'.&mt('Please stand by.').'</h3>'.
+                '<input type="hidden" name="'.$possiblerole.'" value="1" />'.
+            '<noscript><br /><input type="submit" name="submit" value="'.&mt('Continue').'" /></noscript>');
+            $r->print("</form>\n");
+            $r->rflush();
+            $r->print('<script type="text/javascript">document.forms.rolechoice.submit();</script>');
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
+        if ($needs_switchserver) {
+            $r->print("<h2>".&mt('Server Switch Required')."</h2>\n".
+                      &mt('Construction Space access is only available from '.
+                          'the home server of the corresponding Author.').'<br />'.
+                      &mt("Click the 'Switch Server' link to go there.").'<br />');
+        }
     }
 # ----------------------------------------------------------------------- Table
-    unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
+    unless ((!$show_course) || ($nochoose) || ($countactive==1)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
     if ($env{'form.destinationurl'}) {
@@ -869,6 +991,24 @@ ENDHEADER
     return OK;
 }
 
+sub gci_info_page {
+    return <<"END";
+<h2>Welcome to the Geoscience Concept Inventory WebCenter</h2>
+<p>
+Use the tabs to navigate the WebCenter and...
+<ul>
+<li>Review and comment on existing GCI questions</li>
+<li>Submit GCI questions of your own</li>
+<li>Create an online test for your students</li>
+<li>View tutorials on creating online tests</li>
+</ul>
+</p>
+<p>For more information about writing and reviewing Concept Inventory questions
+please refer to the <a href="/res/gci/gci/internal/pdfs/GCIWorkbook.pdf">GCI Workbook</a>.
+
+END
+}
+
 sub gather_roles {
     my ($then,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones) = @_;
     my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,'');
@@ -974,7 +1114,7 @@ sub gather_roles {
                 } elsif ($trest) {
                     my $tcourseid=$tdom.'_'.$trest;
                     $ttype = &Apache::loncommon::course_type($tcourseid);
-                    $trole = &Apache::lonnet::plaintext($role,$ttype);
+                    $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
                         $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
@@ -993,7 +1133,7 @@ sub gather_roles {
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
                               '</span>';
                             $ttype = $newhash{'type'};
-                            $trole = &Apache::lonnet::plaintext($role,$ttype);
+                            $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
                         } else {
                             $twhere=&mt('Currently not available');
                             $env{'course.'.$tcourseid.'.description'}=$twhere;
@@ -1109,7 +1249,7 @@ sub roletable_headers {
 }
 
 sub roletypes {
-    my @types = ('Domain','Construction Space','Course','Unavailable','System');
+    my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
     return @types; 
 }
 
@@ -1173,8 +1313,8 @@ sub findcourse_advice {
     }
     $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
               '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
-    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');
-    &queued_selfenrollment($r);
+    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.
+              &Apache::loncoursequeueadmin::queued_selfenrollment());
     return;
 }
 
@@ -1188,14 +1328,20 @@ sub requestcourse_advice {
         my ($types,$typename) = &Apache::loncommon::course_types();
         if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { 
             $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
-                      '<p>'.&mt('You have rights to create courses and/or communities in the following domain(s):').'<ul>');
+                      '<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');
             my (@reqdoms,@reqtypes);
             foreach my $type (sort(keys(%request_doms))) {
                 push(@reqtypes,$type); 
                 if (ref($request_doms{$type}) eq 'ARRAY') {
                     my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
-                    $r->print(&mt('[_1] in domain: [_2]',
-                              '<li><i>'.$typename->{$type}.'</i>','<b>'.$domstr.'</b></li>'));
+                    $r->print(
+                        '<li>'
+                       .&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
+                            '<i>',
+                            '</i>',
+                            '<b>'.$domstr.'</b>')
+                       .'</li>'
+                    );
                     foreach my $dom (@{$request_doms{$type}}) {
                         unless (grep(/^\Q$dom\E/,@reqdoms)) {
                             push(@reqdoms,$dom);
@@ -1225,49 +1371,6 @@ sub requestcourse_advice {
     return;
 }
 
-sub queued_selfenrollment {
-    my ($r) = @_;
-    my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
-    my %reqs_by_date;
-    foreach my $item (keys(%selfenrollrequests)) {
-        if (ref($selfenrollrequests{$item}) eq 'HASH') {
-            if ($selfenrollrequests{$item}{'status'} eq 'request') {
-                if ($selfenrollrequests{$item}{'timestamp'}) {
-                    push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item);
-                }
-            } 
-        }
-    }
-    if (keys(%reqs_by_date)) {
-        my $rolename = &Apache::lonnet::plaintext('st');
-        $r->print('<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />'.
-                  &Apache::loncommon::start_data_table().
-                  &Apache::loncommon::start_data_table_header_row().
-                  '<th>'.&mt('Date requested').'</th><th>'.&mt('Course title').'</th>'.
-                  '<th>'.&mt('User role').'</th><th>'.&mt('Section').'</th>'.
-                 &Apache::loncommon::end_data_table_header_row());
-        my @sorted = sort { $a <=> $b } (keys(%reqs_by_date));
-        foreach my $item (@sorted) {
-            if (ref($reqs_by_date{$item}) eq 'ARRAY') {
-                foreach my $crs (@{$reqs_by_date{$item}}) {
-                    my %courseinfo = &Apache::lonnet::coursedescription($crs);
-                    my $usec = $selfenrollrequests{$crs}{'section'};
-                    if ($usec eq '') {
-                        $usec = &mt('No section'); 
-                    }
-                    $r->print(&Apache::loncommon::start_data_table_row().
-                             '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
-                             '<td>'.$courseinfo{'description'}.'</td>'.
-                             '<td>'.$rolename.'</td><td>'.$usec.'</td>'.
-                             &Apache::loncommon::end_data_table_row());
-                }
-            }
-        }
-        $r->print(&Apache::loncommon::end_data_table());
-    }
-    return;
-}
-
 sub privileges_info {
     my ($which) = @_;
     my $output;
@@ -1447,10 +1550,11 @@ sub check_fordc {
 
 sub adhoc_course_role {
     my ($refresh,$then) = @_;
-    my ($cdom,$cnum);
+    my ($cdom,$cnum,$crstype);
     $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    if (&check_forcc($cdom,$cnum,$refresh,$then)) {
+    $crstype = &Apache::loncommon::course_type();
+    if (&check_forcc($cdom,$cnum,$refresh,$then,$crstype)) {
         my $setprivs;
         if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
             $setprivs = 1;
@@ -1500,11 +1604,16 @@ sub adhoc_course_role {
 }
 
 sub check_forcc {
-    my ($cdom,$cnum,$refresh,$then) = @_;
-    my $is_cc;
+    my ($cdom,$cnum,$refresh,$then,$crstype) = @_;
+    my ($is_cc,$ccrole);
+    if ($crstype eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    }
     if ($cdom ne '' && $cnum ne '') {
         if (&Apache::lonnet::is_course($cdom,$cnum)) {
-            my $envkey = 'user.role.cc./'.$cdom.'/'.$cnum;
+            my $envkey = 'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum;
             if (defined($env{$envkey})) {
                 $is_cc = 1;
                 my ($tstart,$tend)=split(/\./,$env{$envkey});
@@ -1521,7 +1630,7 @@ sub courselink {
     my $courseform=&Apache::loncommon::selectcourse_link
                    ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
                     'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
-                    $dcdom,$dcdom,undef);
+                    $dcdom,$dcdom,undef,'Course/Community');
     my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
@@ -1531,7 +1640,7 @@ sub courselink {
 
 sub coursepick_jscript {
     my %lt = &Apache::lonlocal::texthash(
-                  plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course or community you wish to enter.",
+                  plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.",
                   youc => 'You can only use this screen to select courses and communities in the current domain.',
              );
     my $verify_script = <<"END";
@@ -1584,9 +1693,10 @@ sub display_cc_role {
     my $advanced = $env{'user.adv'};
     my $tryagain = $env{'form.tryagain'};
     unless ($rolekey =~/^error\:/) {
-        if ($rolekey =~ m-^user\.role.cc\./($match_domain)/($match_courseid)$-) {
-            my $tcourseid = $1.'_'.$2;
-            my $trolecode = 'cc./'.$1.'/'.$2;
+        if ($rolekey =~ m{^user\.role\.(cc|co)\./($match_domain)/($match_courseid)$}) {
+            my $ccrole = $1;
+            my $tcourseid = $2.'_'.$3;
+            my $trolecode = $1.'./'.$2.'/'.$3;
             my $twhere;
             my $ttype;
             my $tbg='LC_roles_is';
@@ -1601,7 +1711,7 @@ sub display_cc_role {
                 $twhere=&mt('Currently not available');
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
-            my $trole = &Apache::lonnet::plaintext('cc',$ttype);
+            my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);
             $twhere.="<br />".&mt('Domain').":".$1;
             ($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
         }
@@ -1617,7 +1727,7 @@ sub adhoc_roles_row {
                      ,'<span class="LC_cusr_emph">','</span>',$dcdom)
                  .' ';
     my $selectcclink = &courselink($dcdom,$rowtype);
-    my $ccrole = &Apache::lonnet::plaintext('cc');
+    my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1);
     my $carole = &Apache::lonnet::plaintext('ca');
     my $selectcalink = &coauthorlink($dcdom,$rowtype);
     $output.=$ccrole.': '.$selectcclink