--- loncom/auth/lonroles.pm	2009/05/22 17:57:03	1.225
+++ loncom/auth/lonroles.pm	2009/12/25 00:26:16	1.240.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.225 2009/05/22 17:57:03 bisitz Exp $
+# $Id: lonroles.pm,v 1.240.2.6 2009/12/25 00:26:16 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::lonmainmenu();
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities;
@@ -157,8 +158,14 @@ sub redirect_user {
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
+
+    # Breadcrumbs
+    my $brcrum = [{'href' => $url,
+                   'text' => 'Switching Role'},];
     my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
-						    {'redirect' => [1,$url],});
+                                                    {'redirect' => [1,$url],
+                                                     'bread_crumbs' => $brcrum,});
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $end_page   = &Apache::loncommon::end_page();
 
 # Note to style police: 
@@ -184,16 +191,25 @@ sub error_page {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
-    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization').
+    # Breadcrumbs
+    my $brcrum = [{'href' => $dest,
+                   'text' => 'Problems during Course Initialization'},];
+    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization',
+                                             undef,
+                                             {'bread_crumbs' => $brcrum,})
+    );
+    $r->print(
         '<script type="text/javascript">'.
         '// <![CDATA['.
         &Apache::lonmenu::rawconfig().
         '// ]]>'.
         '</script>'.
 	      '<p class="LC_error">'.&mt('The following problems occurred:').
+          '<br />'.
 	      $error.
-	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
-	      &Apache::loncommon::end_page());
+	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'
+    );
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub handler {
@@ -202,10 +218,15 @@ sub handler {
 
     my $now=time;
     my $then=$env{'user.login.time'};
+    my $refresh=$env{'user.refresh.time'};
+    if (!$refresh) {
+        $refresh = $then;
+    }
     my $envkey;
     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'}) {
@@ -220,7 +241,7 @@ sub handler {
             # Check if user is CC trying to select a course role
             if ($env{'form.switchrole'}) {
                 if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
-                    &adhoc_course_role($then);
+                    &adhoc_course_role($refresh,$then);
                 }
             }
 	    my %temp=('logout_'.$env{'request.course.id'} => time);
@@ -237,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,$now,'cc');
+                                                           $then,$refresh,$now,$ccrole);
                     }
                     last;
                 }
@@ -283,7 +304,7 @@ sub handler {
                         my ($server_status,$home) = &check_author_homeserver($user,$domain);
                         if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
                             &Apache::lonnet::check_adhoc_privs($domain,$user,$then,
-                                                               $now,'ca');
+                                                               $refresh,$now,'ca');
                             if ($server_status eq 'switchserver') {
                                 my $trolecode = 'ca./'.$domain.'/'.$user; 
                                 my $switchserver = '/adm/switchserver?'
@@ -300,11 +321,13 @@ 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);
-            &Apache::lonnet::role_status($envkey,$then,$now,\$role,\$where,
+            &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where,
                                          \$trolecode,\$tstatus,\$tstart,\$tend);
             if ($env{'form.'.$trolecode}) {
 		if ($tstatus eq 'is') {
@@ -427,6 +450,8 @@ 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 (($env{'form.orgurl'}) && 
@@ -440,8 +465,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 {
@@ -460,8 +483,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);
@@ -473,8 +494,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'}) {
@@ -497,7 +518,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'),
@@ -512,6 +533,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]',
@@ -554,7 +578,6 @@ ENDENTERKEY
         }
     }
 
-
 # =============================================================== No Roles Init
 
     &Apache::loncommon::content_type($r,'text/html');
@@ -562,23 +585,34 @@ 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);
     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 $start_page = &Apache::loncommon::start_page('Main Menu',undef,
+                                                        {'bread_crumbs' => 1});
+        $r->print(<<"ENDCUSTOM");
+$start_page
+<br />
+<noscript>
+$noscript
+</noscript>
+ENDCUSTOM
+    } else {
+        $crumbtext = 'User Roles';
+        $pagetitle = 'My Roles';
+        $recent = &mt('Recent Roles');
+        $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;
+        $r->print(<<ENDHEADER);
 $start_page
 <br />
 <noscript>
@@ -605,6 +639,7 @@ function enterrole (thisform,rolecode,bu
 // ]]>
 </script>
 ENDHEADER
+    }
 
 # ------------------------------------------ Get Error Message from Environment
 
@@ -653,11 +688,12 @@ ENDHEADER
             if ($reinit) {
                 $r->print(
  '<h3><span class="LC_error">'.
- &mt('As your session file for the course has expired, you will need to re-select the course.').'</span></h3>');
+ &mt('As your session file for the course or community has expired, you will need to re-select it.').'</span></h3>');
             } else {
 	        $r->print(
  '<h3><span class="LC_error">'.
- &mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');
+ &mt('You need to choose another user role or enter a specific course or community for this function.').
+ '</span></h3>');
 	    }
         }
     }
@@ -671,200 +707,92 @@ 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="" />');
-    }
-    my (%roletext,%sortrole,%roleclass);
-    my $countactive=0;
-    my $countfuture=0;
-    my $countwill=0;
-    my $inrole=0;
-    my $possiblerole='';
-    my %futureroles;
-    my %roles_nextlogin;
-    my %timezones;
-    foreach $envkey (sort keys %env) {
-        my $button = 1;
-        my $switchserver='';
-	my ($roletext,$roletext_end);
-	my $sortkey;
-        if ($envkey=~/^user\.role\./) {
-            my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
-            &Apache::lonnet::role_status($envkey,$then,$now,\$role,\$where,
-                                         \$trolecode,\$tstatus,\$tstart,\$tend);
-            next if (!defined($role) || $role eq '' || $role =~ /^gr/);
-            my $timezone = &role_timezone($where,\%timezones);
-            $tremark='';
-            $tpstart='&nbsp;';
-            $tpend='&nbsp;';
-            if ($tstart) {
-                $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
-            }
-            if ($tend) {
-                $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone);
-            }
-            if ($env{'request.role'} eq $trolecode) {
-		$tstatus='selected';
+        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);
+    my ($countactive,$countfuture,$inrole,$possiblerole) = 
+        &gather_roles($then,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,\%roleclass,
+                      \%futureroles,\%timezones);
+
+    $refresh = $now;
+    &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
+    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();
+        $env{'browser.interface'}='faketextual';
+        $env{'environment.remote'}='off';
+        my $numcourses = keys(%courses);
+        my $switcher;
+        if ($numcourses > 0) {
+            $switcher = &Apache::lonmainmenu::gcitest_switcher(%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 $tbg;
-            if (($tstatus eq 'is') 
-		|| ($tstatus eq 'selected') 
-		|| ($tstatus eq 'will') 
-		|| ($tstatus eq 'future') 
-                || ($env{'form.showall'})) {
-                if ($tstatus eq 'is') {
-                    $tbg='LC_roles_is';
-		    $possiblerole=$trolecode;
-		    $countactive++;
-                } elsif ($tstatus eq 'future') {
-                    $tbg='LC_roles_future';
-                    $button=0;
-                    $futureroles{$trolecode} = $tstart.':'.$tend;
-                    $countfuture ++;
-                } elsif ($tstatus eq 'will') {
-                    $tbg='LC_roles_will';
-                    $tremark.=&mt('Active at next login.').' ';
-                    $roles_nextlogin{$trolecode} = $tstart.':'.$tend;
-                    $countwill ++;
-                } elsif ($tstatus eq 'expired') {
-                    $tbg='LC_roles_expired';
-                    $button=0;
-                } elsif ($tstatus eq 'will_not') {
-                    $tbg='LC_roles_will_not';
-                    $tremark.=&mt('Expired after logout.').' ';
-                } elsif ($tstatus eq 'selected') {
-                    $tbg='LC_roles_selected';
-		    $inrole=1;
-		    $countactive++;
-                    $tremark.=&mt('Currently selected.').' ';
-                }
-                my $trole;
-                if ($role =~ /^cr\//) {
-                    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-		    if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
-		}
-		$trole=Apache::lonnet::plaintext($role);
-                my $ttype;
-                my $twhere;
-                my ($tdom,$trest,$tsection)=
-                    split(/\//,Apache::lonnet::declutter($where));
-                # First, Co-Authorship roles
-                if (($role eq 'ca') || ($role eq 'aa')) {
-                    my $home = &Apache::lonnet::homeserver($trest,$tdom);
-		    my $allowed=0;
-		    my @ids=&Apache::lonnet::current_machine_ids();
-		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-                    if (!$allowed) {
-			$button=0;
-                        $switchserver='otherserver='.$home.'&role='.$trolecode;
-                    }
-                    #next if ($home eq 'no_host');
-                    $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
-                    $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
-			': '.$tdom.'<br />'.
-                        ' '.&mt('Server').':&nbsp;'.$home;
-                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
-		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
-		    $sortkey=$role."$trest:$tdom";
-                } elsif ($role eq 'au') {
-                    # Authors
-                    my $home = &Apache::lonnet::homeserver
-                        ($env{'user.name'},$env{'user.domain'});
-		    my $allowed=0;
-		    my @ids=&Apache::lonnet::current_machine_ids();
-		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-                    if (!$allowed) {
-			$button=0;
-                        $switchserver='otherserver='.$home.'&role='.$trolecode;
-                    }
-                    #next if ($home eq 'no_host');
-                    $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
-                    $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
-			':&nbsp;'.$home;
-                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
-		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
-		    $sortkey=$role;
-                } elsif ($trest) {
-                    my $tcourseid=$tdom.'_'.$trest;
-                    $ttype = &Apache::loncommon::course_type($tcourseid);
-                    $trole = &Apache::lonnet::plaintext($role,$ttype);
-                    if ($env{'course.'.$tcourseid.'.description'}) {
-                        $twhere=$env{'course.'.$tcourseid.'.description'};
-			$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
-                        unless ($twhere eq &mt('Currently not available')) {
-			    $twhere.=' <span class="LC_fontsize_small">'.
-        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
-                                    '</span>';
-			}
-                    } else {
-                        my %newhash=&Apache::lonnet::coursedescription($tcourseid);
-                        if (%newhash) {
-			    $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
-				"\0".$envkey;
-                            $twhere=$newhash{'description'}.
-                              ' <span class="LC_fontsize_small">'.
-        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
-                              '</span>';
-                            $ttype = $newhash{'type'};
-                            $trole = &Apache::lonnet::plaintext($role,$ttype);
-                        } else {
-                            $twhere=&mt('Currently not available');
-                            $env{'course.'.$tcourseid.'.description'}=$twhere;
-			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
-                            $ttype = 'Unavailable';
-                        }
-                    }
-                    if ($tsection) {
-                        $twhere.='<br />'.&mt('Section').': '.$tsection;
-		    }
-		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
-                } elsif ($tdom) {
-                    $ttype='Domain';
-                    $twhere=$tdom;
-		    $sortkey=$role.$twhere;
-                } else {
-                    $ttype='System';
-                    $twhere=&mt('system wide');
-		    $sortkey=$role.$twhere;
-                }
-                ($roletext,$roletext_end) = 
-                    &build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,
-                                    $advanced,$tremark,$tbg,$trole,$twhere,$tpstart,
-                                    $tpend,$nochoose,$button,$switchserver,$reinit);
-		$roletext{$envkey}=[$roletext,$roletext_end];
-		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
-		$sortrole{$sortkey}=$envkey;
-		$roleclass{$envkey}=$ttype;
-	    }
+            my $switcher_js = &Apache::lonmainmenu::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);
             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 Catalog[_3] to view all [_4] LON-CAPA courses.','<b>','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a></b>',$domdesc).'<br />'.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','<b>','</b>').'</p>');
+            $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>'
+            );
         }
     }
 
 # No active roles
     if ($countactive==0) {
 	if ($inrole) {
-	    $r->print('<h2>'.&mt('Currently no additional roles or courses').'</h2>');
+	    $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
 	} else {
-	    $r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');
+	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
 	}
         &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));
@@ -893,11 +821,40 @@ 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)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
+    if ($env{'form.destinationurl'}) {
+        $r->print('<input type="hidden" name="destinationurl" value="'.
+                  $env{'form.destinationurl'}.'" />');
+        if ($env{'form.destsymb'} ne '') {
+            $r->print('<input type="hidden" name="destsymb" value="'.
+                      $env{'form.destsymb'}.'" />');
+        }
+    }
     my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose);
     if ($env{'environment.recentroles'}) {
         my %recent_roles =
@@ -976,18 +933,194 @@ ENDHEADER
     $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {
         my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
-	$r->print('<p><small><i>'
-                 .&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))
-		 .'</i><br />'
-		 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
+        $r->print('<p><small><i>'
+                 .&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion'))
+                 .'</i><br />'
+                 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
                  .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                 .&mt('Course Catalog')
+                 .&mt('Course/Community Catalog')
                  .'</a></small></p>');
     }
     $r->print(&Apache::loncommon::end_page());
     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 a GCI question of your own</li>
+<li>Create an online test for your students</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,'');
+    my $advanced = $env{'user.adv'};
+    my $tryagain = $env{'form.tryagain'};
+    foreach my $envkey (sort(keys(%env))) {
+        my $button = 1;
+        my $switchserver='';
+        my ($role_text,$role_text_end,$sortkey);
+        if ($envkey=~/^user\.role\./) {
+            my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
+            &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where,
+                                         \$trolecode,\$tstatus,\$tstart,\$tend);
+            next if (!defined($role) || $role eq '' || $role =~ /^gr/);
+            my $timezone = &role_timezone($where,$timezones);
+            $tremark='';
+            $tpstart='&nbsp;';
+            $tpend='&nbsp;';
+            if ($tstart) {
+                $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
+            }
+            if ($tend) {
+                $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone);
+            }
+            if ($env{'request.role'} eq $trolecode) {
+                $tstatus='selected';
+            }
+            my $tbg;
+            if (($tstatus eq 'is')
+                || ($tstatus eq 'selected')
+                || ($tstatus eq 'future')
+                || ($env{'form.showall'})) {
+                if ($tstatus eq 'is') {
+                    $tbg='LC_roles_is';
+                    $possiblerole=$trolecode;
+                    $countactive++;
+                } elsif ($tstatus eq 'future') {
+                    $tbg='LC_roles_future';
+                    $button=0;
+                    $futureroles->{$trolecode} = $tstart.':'.$tend;
+                    $countfuture ++;
+                } elsif ($tstatus eq 'expired') {
+                    $tbg='LC_roles_expired';
+                    $button=0;
+                } elsif ($tstatus eq 'will_not') {
+                    $tbg='LC_roles_will_not';
+                    $tremark.=&mt('Expired after logout.').' ';
+                } elsif ($tstatus eq 'selected') {
+                    $tbg='LC_roles_selected';
+                    $inrole=1;
+                    $countactive++;
+                    $tremark.=&mt('Currently selected.').' ';
+                }
+                my $trole;
+                if ($role =~ /^cr\//) {
+                    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
+                    if ($tremark) { $tremark.='<br />'; }
+                    $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
+                }
+                $trole=Apache::lonnet::plaintext($role);
+                my $ttype;
+                my $twhere;
+                my ($tdom,$trest,$tsection)=
+                    split(/\//,Apache::lonnet::declutter($where));
+                # First, Co-Authorship roles
+                if (($role eq 'ca') || ($role eq 'aa')) {
+                    my $home = &Apache::lonnet::homeserver($trest,$tdom);
+                    my $allowed=0;
+                    my @ids=&Apache::lonnet::current_machine_ids();
+                    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+                    if (!$allowed) {
+                        $button=0;
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
+                    }
+                    #next if ($home eq 'no_host');
+                    $home = &Apache::lonnet::hostname($home);
+                    $ttype='Construction Space';
+                    $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
+                        ': '.$tdom.'<br />'.
+                        ' '.&mt('Server').':&nbsp;'.$home;
+                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+                    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
+                    $sortkey=$role."$trest:$tdom";
+                } elsif ($role eq 'au') {
+                    # Authors
+                    my $home = &Apache::lonnet::homeserver
+                        ($env{'user.name'},$env{'user.domain'});
+                    my $allowed=0;
+                    my @ids=&Apache::lonnet::current_machine_ids();
+                    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+                    if (!$allowed) {
+                        $button=0;
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
+                    }
+                    #next if ($home eq 'no_host');
+                    $home = &Apache::lonnet::hostname($home);
+                    $ttype='Construction Space';
+                    $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
+                        ':&nbsp;'.$home;
+                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+                    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
+                    $sortkey=$role;
+                } elsif ($trest) {
+                    my $tcourseid=$tdom.'_'.$trest;
+                    $ttype = &Apache::loncommon::course_type($tcourseid);
+                    $trole = &Apache::lonnet::plaintext($role,$ttype);
+                    if ($env{'course.'.$tcourseid.'.description'}) {
+                        $twhere=$env{'course.'.$tcourseid.'.description'};
+                        $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
+                        unless ($twhere eq &mt('Currently not available')) {
+                            $twhere.=' <span class="LC_fontsize_small">'.
+        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
+                                    '</span>';
+                        }
+                    } else {
+                        my %newhash=&Apache::lonnet::coursedescription($tcourseid);
+                        if (%newhash) {
+                            $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
+                                "\0".$envkey;
+                            $twhere=$newhash{'description'}.
+                              ' <span class="LC_fontsize_small">'.
+        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
+                              '</span>';
+                            $ttype = $newhash{'type'};
+                            $trole = &Apache::lonnet::plaintext($role,$ttype);
+                        } else {
+                            $twhere=&mt('Currently not available');
+                            $env{'course.'.$tcourseid.'.description'}=$twhere;
+                            $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
+                            $ttype = 'Unavailable';
+                        }
+                    }
+                    if ($tsection) {
+                        $twhere.='<br />'.&mt('Section').': '.$tsection;
+                    }
+                    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
+                } elsif ($tdom) {
+                    $ttype='Domain';
+                    $twhere=$tdom;
+                    $sortkey=$role.$twhere;
+                } else {
+                    $ttype='System';
+                    $twhere=&mt('system wide');
+                    $sortkey=$role.$twhere;
+                }
+                ($role_text,$role_text_end) =
+                    &build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,
+                                    $advanced,$tremark,$tbg,$trole,$twhere,$tpstart,
+                                    $tpend,$nochoose,$button,$switchserver,$reinit);
+                $roletext->{$envkey}=[$role_text,$role_text_end];
+                if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
+                $sortrole->{$sortkey}=$envkey;
+                $roleclass->{$envkey}=$ttype;
+            }
+        }
+    }
+    return ($countactive,$countfuture,$inrole,$possiblerole);
+}
+
 sub role_timezone {
     my ($where,$timezones) = @_;
     my $timezone;
@@ -1069,7 +1202,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; 
 }
 
@@ -1131,12 +1264,66 @@ sub findcourse_advice {
     } else {
         $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
     }
-    $r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
-    $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');
+    $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);
     return;
 }
 
+sub requestcourse_advice {
+    my ($r) = @_;
+    my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+    my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+    my (%can_request,%request_doms);
+    &Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
+    if (keys(%request_doms) > 0) {
+        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 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(
+                        '<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);
+                        }
+                    }
+                }
+            }
+            my @showtypes;
+            foreach my $type (@{$types}) {
+                if (grep(/^\Q$type\E$/,@reqtypes)) {
+                    push(@showtypes,$type);
+                }
+            }
+            my $requrl = '/adm/requestcourse';
+            if (@reqdoms == 1) {
+                $requrl .= '?showdom='.$reqdoms[0];
+            }
+            if (@showtypes > 0) {
+                $requrl.=(($requrl=~/\?/)?'&':'?').'crstype='.$showtypes[0];
+            }
+            if (@reqdoms == 1 || @showtypes > 0) {
+                $requrl .= '&state=crstype&action=new';
+            } 
+            $r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');
+        }
+    }
+    return;
+}
+
 sub queued_selfenrollment {
     my ($r) = @_;
     my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
@@ -1358,21 +1545,22 @@ sub check_fordc {
 }
 
 sub adhoc_course_role {
-    my ($then) = @_; 
-    my ($cdom,$cnum);
+    my ($refresh,$then) = @_;
+    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,$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;
         } else {
             my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
-            if (($start && ($start>$then || $start == -1)) ||
+            if (($start && ($start>$refresh || $start == -1)) ||
                 ($end && $end<$then)) {
                 $setprivs = 1;
             }
-        } 
+        }
         if ($setprivs) {
             if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
                 my $role = $1;
@@ -1402,7 +1590,7 @@ sub adhoc_course_role {
                 }
                 &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
                 &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
-                my $adhocstart = $then-1;
+                my $adhocstart = $refresh-1;
                 $userroles{'user.role.'.$spec} = $adhocstart.'.';
                 &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
             }
@@ -1412,15 +1600,20 @@ sub adhoc_course_role {
 }
 
 sub check_forcc {
-    my ($cdom,$cnum,$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});
-                if ($tstart && $tstart>$then) { $is_cc = 0; }
+                if ($tstart && $tstart>$refresh) { $is_cc = 0; }
                 if ($tend   && $tend  <$then) { $is_cc = 0; }
             }
         }
@@ -1433,7 +1626,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="" />'.
@@ -1443,8 +1636,8 @@ 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 you wish to enter.",
-                  youc => 'You can only use this screen to select courses in the current domain.',
+                  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";
 <script type="text/javascript">
@@ -1496,9 +1689,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';
@@ -1513,7 +1707,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);
             $twhere.="<br />".&mt('Domain').":".$1;
             ($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
         }
@@ -1525,21 +1719,15 @@ sub adhoc_roles_row {
     my ($dcdom,$rowtype) = @_;
     my $output = &Apache::loncommon::continue_data_table_row()
                  .' <td colspan="5">'
-                 .'<table><tr><td>'
                  .&mt('[_1]Ad hoc[_2] roles in domain [_3] --'
                      ,'<span class="LC_cusr_emph">','</span>',$dcdom)
-                 .'</td>'
-                 .'<td>';
+                 .' ';
     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.=&mt('[_1]: [_2]',$ccrole,$selectcclink)
-            .'<br /></td>'
-            .'<td>&nbsp;&nbsp;</td>'
-            .'<td>'.&mt('[_1]: [_2]',$carole,$selectcalink).'<br /></td>'
-            .'</tr></table>'
-            .'</td>'
+    $output.=$ccrole.': '.$selectcclink
+            .' | '.$carole.': '.$selectcalink
             .&Apache::loncommon::end_data_table_row();
     return $output;
 }