--- loncom/auth/lonroles.pm	2010/10/04 17:43:24	1.240.2.17
+++ loncom/auth/lonroles.pm	2010/12/05 16:35:58	1.240.2.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.240.2.17 2010/10/04 17:43:24 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.21 2010/12/05 16:35:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -500,7 +500,7 @@ ENDENTERKEY
 				    $courseid = substr($courseid, 1);
 				}
 				$courseid =~ s/\//_/;
-				if (($cdom ne 'gcitest') && (($role eq 'cc') || ($role eq 'co')) 
+				if (($cdom !~ /^\w+citest$/) && (($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
@@ -524,7 +524,7 @@ ENDENTERKEY
 								    .$env{'request.course.sec'})
 					) {
 					my $startpage = &courseloadpage($courseid);
-					unless (($startpage eq 'firstres') || ($cdom eq 'gcitest')) {
+					unless (($startpage eq 'firstres') || ($cdom =~ /^\w+citest$/)) {
 					    $msg = &mt('Entering [_1] ...',
 						       $env{'course.'.$courseid.'.description'});
 					    &redirect_user($r,&mt('New in course'),
@@ -539,7 +539,7 @@ ENDENTERKEY
 # Guess not ...
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}
-                                if (($cdom eq 'gcitest') && ($custommenu)) {
+                                if (($cdom =~ /^\w+citest$/) && ($custommenu)) {
                                     $furl = '/adm/navmaps';
                                 }
                                 $msg = &mt('Entering [_1] ...',
@@ -592,16 +592,12 @@ ENDENTERKEY
     return OK if $r->header_only;
 
     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 />';
+    $show_course=&Apache::loncommon::show_course();
+    my $noscript='<br /><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 />';
     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);
+        my $start_page = &Apache::loncommon::start_page('Main Menu');
         $r->print(<<"ENDCUSTOM");
 $start_page
-<br />
 <noscript>
 $noscript
 </noscript>
@@ -610,20 +606,28 @@ ENDCUSTOM
         $crumbtext = 'User Roles';
         $pagetitle = 'My Roles';
         $recent = &mt('Recent Roles');
-        $show_course=&Apache::loncommon::show_course();
+        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 $brcrum = [{ href    => '/adm/roles',
+                         text    => $crumbtext,},
+                     ];
+        my $args;
+        if ($numdc) {
+            $args = {bread_crumbs => $brcrum};
+        } else {
+            $args = {bread_crumbs          => $brcrum,
+                     bread_crumbs_menulink => '_nomenu'};
+        }
+        my $start_page=&Apache::loncommon::start_page($pagetitle,undef,$args);
         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>
 $noscript
 </noscript>
@@ -751,19 +755,6 @@ ENDHEADER
         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());
@@ -784,7 +775,7 @@ ENDSCRIPT
             $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
-            unless ($env{'user.domain'} eq 'gcitest') {
+            unless ($env{'user.domain'} =~ /^\w+citest$/) {
                 $r->print(
                     '<p>'
                    .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
@@ -807,15 +798,31 @@ ENDSCRIPT
 	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'} =~ /^\w+citest$/) {
+                    $r->print('<h2>'.&mt('Currently no active Concept Tests').'</h2>');
+                } elsif ($env{'user.domain'} =~ /ci$/) {
+                    $r->print('<h2>'.&mt('Currently not assigned as a GCI contributor').'</h2>');
+                }
+            } else {
+	        $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
+            }
 	}
-        unless ($env{'user.domain'} eq 'gcitest') {
+        unless ($env{'user.domain'} =~ /^\w+citest$/) {
             &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'} =~ /^\w+citest$/) {
+                    $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,
@@ -864,7 +871,7 @@ ENDSCRIPT
         }
     }
 # ----------------------------------------------------------------------- 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'}) {
@@ -967,6 +974,8 @@ ENDSCRIPT
 
 sub gci_info_page {
     return <<"END";
+<br clear="all">
+<div>
 <h2>Welcome to the Geoscience Concept Inventory WebCenter</h2>
 <p>
 Use the tabs to navigate the WebCenter and...
@@ -979,7 +988,7 @@ Use the tabs to navigate the WebCenter a
 </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>.
-
+</div>
 END
 }
 
@@ -1285,10 +1294,15 @@ 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('<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>'.
-              &Apache::loncoursequeueadmin::queued_selfenrollment());
+    my $queued = &Apache::loncoursequeueadmin::queued_selfenrollment();
+    if ($queued) {
+        $r->print($queued);
+    } else {
+        $r->print(&mt('You have no request for contributor access pending approval by the GCI WebCenter team.').'<ul>'.
+            '<li>'.&mt('This may mean that action was taken on your request in the time since your most recent log-in.[_1]View [_2]Message[_3] to see if this is the case.','<br />','<a href="/adm/communicate">','</a>').'</li>'.
+            '<li>'.&mt('If you logout and log-in again you may find you now have access to the Geoscience Concept Inventory, as a contributor.').'</li>'.
+           '</ul>');
+    }
     return;
 }